Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:45+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 10:16+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-02 08:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -257,6 +257,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -311,6 +311,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 ""
 
@@ -334,9 +334,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
@@ -427,6 +427,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -579,5 +579,6 @@
 "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
@@ -636,12 +637,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1426,5 +1427,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1445,5 +1447,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1591,5 +1593,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 
@@ -1611,5 +1614,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1813,5 +1816,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
@@ -1877,9 +1881,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)"
@@ -1896,5 +1900,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2184,7 +2188,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "أخطاء عند التنزيل"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2218,6 +2222,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2348,6 +2352,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 ""
 
@@ -2465,68 +2469,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "بحث..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "بحث عن أغراض."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "الرجاء إدخال مصطلحات البحث."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "إستبدل الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "أضف إلى اخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "أحذف من الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "عبارة منتظمة"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
-msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2534,38 +2538,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>الأهداف المميزة:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>النوع:</b> - نوع الغرض (<b>عقدة</b>, <b>طريق</b>, <b>علاقة</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>المستخدم:</b>... - كلّ الأغراض اللتي قام المستخدم بتغييرها"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2573,5 +2577,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2579,11 +2583,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2591,5 +2595,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2597,39 +2605,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>مغيير</b> - كلّ الأغراض المغييرة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>المختارة</b> - كلّ الأغراض المختارة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>غير المكتملة</b> - كلّ الأغراض غير المكتملة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>غير المسمات</b> - كلّ الأغراض غير المسمات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "إستعمل <b>|</b> أو <b>أو</b> للدمج بالأو المنطقي"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2637,11 +2645,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2649,38 +2657,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "إبحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "إبدء البحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "لم أجد شيء مطابق لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2688,5 +2696,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2694,5 +2702,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2700,5 +2708,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2713,50 +2721,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2820,5 +2831,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3026,7 +3037,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 ""
 
@@ -3287,6 +3298,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 ""
 
@@ -3369,5 +3380,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3376,5 +3387,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3383,5 +3394,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3418,5 +3429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3469,5 +3480,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3475,5 +3486,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3481,17 +3492,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr ""
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3499,5 +3504,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3506,5 +3511,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3512,5 +3517,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3518,5 +3523,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3524,42 +3529,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3568,5 +3573,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3574,5 +3579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3640,5 +3645,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3648,81 +3654,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "دور غير معروف ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "لم أجد طريق \"من\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "لم أجد طريق \"إلى\""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "خطأ : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3896,5 +3902,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3969,5 +3976,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3977,5 +3984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3984,5 +3991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3991,5 +3998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3998,5 +4005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4005,5 +4012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4012,9 +4019,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4325,6 +4332,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4339,4 +4346,5 @@
 msgstr "حرّر"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4529,5 +4537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4566,6 +4574,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 ""
 
@@ -4596,5 +4604,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"
@@ -4603,5 +4611,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"
@@ -4610,5 +4618,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"
@@ -4822,5 +4830,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4845,6 +4854,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4856,5 +4866,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr ""
@@ -4899,6 +4909,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 ""
 
@@ -4906,6 +4916,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 ""
 
@@ -4956,6 +4966,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 ""
 
@@ -5172,6 +5182,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5184,6 +5194,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5485,7 +5495,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 ""
 
@@ -5510,5 +5520,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5526,6 +5537,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5549,5 +5559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5555,5 +5565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5626,9 +5636,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5646,13 +5657,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5661,45 +5672,41 @@
 msgstr "أضِف"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5926,10 +5933,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6270,4 +6277,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7381,6 +7389,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 ""
 
@@ -7404,8 +7412,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 ""
 
@@ -7525,5 +7533,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7532,23 +7540,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "غيّر القيم ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7557,5 +7565,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7564,77 +7572,81 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "عضو من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7749,6 +7761,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 ""
 
@@ -7766,6 +7778,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 ""
 
@@ -7920,6 +7932,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8251,6 +8264,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8310,4 +8324,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8390,6 +8405,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 ""
 
@@ -8399,6 +8414,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 ""
 
@@ -8672,8 +8687,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8688,7 +8704,8 @@
 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 ""
 
@@ -8739,5 +8756,6 @@
 #: ../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
@@ -8924,5 +8942,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8939,5 +8957,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9022,6 +9041,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] ""
@@ -9035,6 +9054,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 "
@@ -9260,5 +9279,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9284,5 +9303,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9337,6 +9357,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 ""
 
@@ -9390,7 +9410,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 ""
 
@@ -9400,5 +9420,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9423,5 +9443,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9639,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 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 ""
 
@@ -9665,7 +9686,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 ""
 
@@ -9729,9 +9750,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -9744,5 +9765,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9906,6 +9927,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 ""
 
@@ -9973,7 +9994,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 ""
 
@@ -10038,64 +10059,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10105,20 +10130,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10127,5 +10152,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10133,21 +10158,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10155,17 +10180,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10174,5 +10199,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10223,14 +10248,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10239,5 +10264,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10246,10 +10271,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10258,5 +10283,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10544,6 +10569,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 ""
 
@@ -10565,8 +10590,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 ""
 
@@ -10686,6 +10711,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 ""
 
@@ -10795,5 +10820,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10927,8 +10953,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 ""
 
@@ -11011,8 +11037,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 ""
 
@@ -11039,7 +11065,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 ""
 
@@ -11110,34 +11136,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11145,5 +11167,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11151,21 +11173,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11173,5 +11189,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11179,5 +11195,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11185,17 +11201,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11203,13 +11219,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11249,5 +11265,5 @@
 msgstr "الألوان"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11258,34 +11274,34 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Force lines if no segments imported."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11293,5 +11309,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11313,5 +11329,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11353,5 +11369,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11365,50 +11381,60 @@
 msgstr "المشي"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "أرسم أسهم الإتجاه"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+msgid "Draw segment order numbers"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw segment order numbers"
+msgid "Draw boundaries of downloaded data"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw boundaries of downloaded data"
+msgid "Draw virtual nodes in select mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw virtual nodes in select mode"
+msgid "Draw inactive layers in other color"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw inactive layers in other color"
+msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11416,35 +11442,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "أرسم سهام الإتجاه حسب البحث في الجدول بدلاً عن إستعمال الرياضيات الصعبة."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11452,13 +11479,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11466,9 +11493,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11476,46 +11503,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "المعطيات أو.أس.أم"
@@ -11587,5 +11615,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11634,6 +11663,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11710,6 +11739,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 ""
 
@@ -11722,9 +11751,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 ""
 
@@ -12022,6 +12051,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 ""
 
@@ -12143,6 +12172,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 ""
 
@@ -12164,6 +12193,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 ""
 
@@ -12241,5 +12270,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12255,5 +12285,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12347,6 +12378,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 ""
 
@@ -12646,5 +12677,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
@@ -12827,5 +12858,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13210,6 +13242,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 ""
 
@@ -13237,6 +13269,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 ""
 
@@ -13278,5 +13310,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13706,14 +13739,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13722,23 +13760,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13746,5 +13779,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13752,17 +13785,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13770,5 +13803,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13780,42 +13813,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13824,5 +13857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13831,30 +13864,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
-#, java-format
-msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13862,14 +13895,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "لا يوجدأي وصف"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13910,5 +13943,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13970,5 +14004,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"
@@ -14051,6 +14085,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 ""
 
@@ -14058,7 +14092,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 ""
 
@@ -14066,7 +14100,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 ""
 
@@ -14074,8 +14108,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 ""
 
@@ -14095,7 +14129,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 ""
 
@@ -14164,6 +14198,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14175,7 +14210,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 ""
 
@@ -14207,9 +14242,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14869,7 +14904,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14879,5 +14914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14887,5 +14922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14901,5 +14936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14909,5 +14944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -14938,5 +14973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -14945,5 +14980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -14952,5 +14987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -14959,5 +14994,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -14966,5 +15001,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -14973,5 +15008,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15005,10 +15040,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15482,34 +15518,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -15582,5 +15619,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15671,4 +15708,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15878,5 +15916,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -15997,5 +16035,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16014,6 +16053,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16319,5 +16359,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -16427,5 +16468,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16476,5 +16518,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17290,4 +17333,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17732,6 +17783,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 ""
 
@@ -17817,8 +17868,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 ""
 
@@ -17872,8 +17923,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 ""
 
@@ -17985,6 +18036,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 ""
 
@@ -17992,6 +18043,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 ""
 
@@ -18625,6 +18676,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18771,5 +18823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18869,5 +18921,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19242,9 +19294,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19253,10 +19302,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr ""
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19264,25 +19313,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19290,17 +19339,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "غابة"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19308,7 +19357,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19318,5 +19367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19359,5 +19408,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19367,5 +19416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19375,5 +19424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19383,8 +19432,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19398,5 +19447,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19407,5 +19456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19414,7 +19463,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19424,5 +19473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19432,5 +19481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19440,5 +19489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19448,5 +19497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19456,5 +19505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19464,5 +19513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19472,8 +19521,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19483,55 +19532,60 @@
 msgstr "طريق"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "ميزات خيارية:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
 msgid "Modified"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "الإسم الحقيقي"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "صفحة الإنترنت"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "List"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "كبّر الرؤية"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "الدور الجديد"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "انشئ عقدة جديدة"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "إحفَظ"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19602,5 +19656,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19766,6 +19821,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19774,5 +19836,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19781,10 +19843,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19793,5 +19855,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19801,5 +19863,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19808,15 +19870,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19825,5 +19887,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20713,7 +20775,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20853,8 +20915,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"/>
@@ -21064,5 +21126,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21072,5 +21134,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21089,5 +21151,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21097,5 +21159,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21114,5 +21176,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21122,5 +21184,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21139,5 +21201,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21147,5 +21209,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21160,5 +21222,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21176,5 +21238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21192,5 +21254,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21199,5 +21261,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21207,5 +21269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21225,5 +21287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21232,5 +21294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21240,5 +21302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21942,5 +22004,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -21991,5 +22053,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22086,5 +22148,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22252,5 +22314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22584,5 +22646,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22592,5 +22654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22600,5 +22662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22608,5 +22670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22616,5 +22678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22624,5 +22686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22632,5 +22694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22641,5 +22703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24059,5 +24121,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24067,5 +24129,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24075,5 +24137,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24083,5 +24145,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24445,7 +24507,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24455,5 +24517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24463,5 +24525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24471,5 +24533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24479,5 +24541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24487,5 +24549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24495,5 +24557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24503,5 +24565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24511,5 +24573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24519,5 +24581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24527,5 +24589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24535,5 +24597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24543,5 +24605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24551,5 +24613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24559,5 +24621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24567,5 +24629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24575,5 +24637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24583,5 +24645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24591,5 +24653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24599,5 +24661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24607,5 +24669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24615,5 +24677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24623,5 +24685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24631,5 +24693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24639,5 +24701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24647,5 +24709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24655,5 +24717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24663,5 +24725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24671,5 +24733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24679,5 +24741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24687,5 +24749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24695,5 +24757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24703,5 +24765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24711,5 +24773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24719,5 +24781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24727,5 +24789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24735,5 +24797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24743,5 +24805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24751,5 +24813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24759,5 +24821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24767,5 +24829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24775,5 +24837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24783,5 +24845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24791,5 +24853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24799,5 +24861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24807,5 +24869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24815,5 +24877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26519,7 +26581,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26529,5 +26591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26537,5 +26599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26545,5 +26607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26553,5 +26615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26561,5 +26623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26569,5 +26631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26577,5 +26639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26585,5 +26647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28006,5 +28068,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28020,5 +28082,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28028,5 +28090,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28037,5 +28099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28048,7 +28110,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28058,5 +28120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28066,5 +28128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28074,5 +28136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28082,5 +28144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28114,5 +28176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28128,5 +28190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28136,5 +28198,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28143,5 +28205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28151,5 +28213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28160,5 +28222,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28183,5 +28245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28296,9 +28358,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
@@ -28306,5 +28368,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,
@@ -28314,8 +28376,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
@@ -28329,5 +28391,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28335,5 +28397,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28382,6 +28444,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>
@@ -28461,5 +28523,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28469,11 +28531,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28489,5 +28551,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28496,5 +28558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28503,5 +28565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28517,5 +28579,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28529,5 +28591,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28536,5 +28598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28543,5 +28605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28550,5 +28612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28557,5 +28619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28564,5 +28626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28571,5 +28633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28578,5 +28640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28585,5 +28647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28592,5 +28654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28599,5 +28661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28606,5 +28668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28613,5 +28675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28620,5 +28682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28627,5 +28689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28802,7 +28864,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28816,5 +28878,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28824,7 +28886,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28834,5 +28896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28842,5 +28904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28850,5 +28912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28858,5 +28920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28872,5 +28934,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28879,5 +28941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28887,5 +28949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -28894,5 +28956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -28901,5 +28963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -28908,5 +28970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -28915,5 +28977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -28922,5 +28984,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -28929,5 +28991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -28936,5 +28998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -28943,5 +29005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -28950,5 +29012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -28962,5 +29024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -28974,5 +29036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -28981,5 +29043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -28993,5 +29055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29006,5 +29068,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29019,5 +29081,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29031,5 +29093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29043,5 +29105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29050,5 +29112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29057,5 +29119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29065,5 +29127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29072,5 +29134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29079,5 +29141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29086,5 +29148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29094,5 +29156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29103,5 +29165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29111,7 +29173,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29121,5 +29183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29129,5 +29191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29137,5 +29199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29146,5 +29208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29153,5 +29215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29161,5 +29223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29169,5 +29231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29177,5 +29239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29185,5 +29247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29193,5 +29255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29201,5 +29263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29209,5 +29271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29217,5 +29279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29225,5 +29287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29246,5 +29308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29259,7 +29321,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29269,5 +29331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29276,5 +29338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29284,5 +29346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29291,5 +29353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29299,5 +29361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29307,5 +29369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29321,5 +29383,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29330,5 +29392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29347,5 +29409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29355,5 +29417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29366,5 +29428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29383,5 +29445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29390,5 +29452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29397,5 +29459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29404,7 +29466,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29415,5 +29477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29428,5 +29490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29440,5 +29502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29448,5 +29510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29460,5 +29522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29472,5 +29534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29479,5 +29541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29486,7 +29548,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29496,5 +29558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29504,5 +29566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29512,5 +29574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29520,5 +29582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29528,5 +29590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29542,7 +29604,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29557,5 +29619,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29570,5 +29632,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29583,5 +29645,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29596,5 +29658,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29609,5 +29671,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29622,7 +29684,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29632,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29639,5 +29701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29647,5 +29709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29655,5 +29717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29663,5 +29725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29671,5 +29733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29679,5 +29741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29687,5 +29749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29695,5 +29757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29703,5 +29765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29711,5 +29773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29719,5 +29781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29727,5 +29789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29745,5 +29807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29758,5 +29820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29769,7 +29831,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29779,5 +29841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29787,5 +29849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29795,5 +29857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29803,5 +29865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29811,5 +29873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29819,5 +29881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29827,5 +29889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29835,5 +29897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29843,5 +29905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29851,5 +29913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29859,5 +29921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29867,5 +29929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29875,5 +29937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29883,5 +29945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -29891,5 +29953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -29899,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -29919,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -29931,7 +29993,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -29941,5 +30003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -29949,5 +30011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -29957,5 +30019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -29965,5 +30027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -29973,5 +30035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -29981,5 +30043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -29989,5 +30051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -29997,5 +30059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30005,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30013,5 +30075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30030,5 +30092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30038,5 +30100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30046,5 +30108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30054,5 +30116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30062,5 +30124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30070,5 +30132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30078,5 +30140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30086,5 +30148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30094,5 +30156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30102,5 +30164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30110,5 +30172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30118,5 +30180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30135,5 +30197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30142,5 +30204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30150,5 +30212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30157,5 +30219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30165,5 +30227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30173,5 +30235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30181,5 +30243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30188,5 +30250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30196,5 +30258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30204,5 +30266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30212,5 +30274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30220,5 +30282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30227,5 +30289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30234,5 +30296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30241,5 +30303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30248,5 +30310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30255,5 +30317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30262,5 +30324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30269,5 +30331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30276,5 +30338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30283,5 +30345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30290,5 +30352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30297,5 +30359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30304,5 +30366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30311,5 +30373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30319,5 +30381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30327,5 +30389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30335,5 +30397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30343,5 +30405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30351,5 +30413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30359,5 +30421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30367,5 +30429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30375,5 +30437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30383,5 +30445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30392,5 +30454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30400,5 +30462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30408,5 +30470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30416,5 +30478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30424,5 +30486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30432,5 +30494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30440,5 +30502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30448,5 +30510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30456,5 +30518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30464,5 +30526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30472,5 +30534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30480,5 +30542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30488,5 +30550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30496,5 +30558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30504,5 +30566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30512,5 +30574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30520,5 +30582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30528,5 +30590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30536,5 +30598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30544,5 +30606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30551,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30581,5 +30643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30589,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30597,7 +30659,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30612,5 +30674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30620,5 +30682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30628,5 +30690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30636,5 +30698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30644,5 +30706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30652,5 +30714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30660,5 +30722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30674,7 +30736,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30684,5 +30746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30692,5 +30754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30700,5 +30762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30708,5 +30770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30716,5 +30778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30724,5 +30786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30732,5 +30794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30740,5 +30802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30748,5 +30810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30756,5 +30818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30764,5 +30826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30772,5 +30834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30780,5 +30842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30788,5 +30850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30796,5 +30858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30804,5 +30866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30812,5 +30874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30820,5 +30882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30828,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30836,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30844,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30852,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30860,5 +30922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30868,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30876,5 +30938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30884,5 +30946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -30892,5 +30954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -30900,5 +30962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -30908,5 +30970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -30916,5 +30978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -30924,5 +30986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -30932,5 +30994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -30940,5 +31002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -30948,5 +31010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -30956,5 +31018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -30964,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -30972,5 +31034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -30980,5 +31042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -30988,5 +31050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -30996,5 +31058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31004,5 +31066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31012,5 +31074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31046,7 +31108,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31056,5 +31118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31064,5 +31126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31072,5 +31134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31080,5 +31142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31088,5 +31150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31096,5 +31158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31104,5 +31166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31119,5 +31181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31127,5 +31189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31135,5 +31197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31143,5 +31205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31151,5 +31213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31159,5 +31221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31168,5 +31230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31176,5 +31238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31184,5 +31246,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31192,5 +31254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31199,5 +31261,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31206,5 +31268,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31222,7 +31284,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31232,5 +31294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31240,5 +31302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31248,5 +31310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31256,5 +31318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31264,5 +31326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31272,5 +31334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31280,5 +31342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31288,5 +31350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31296,5 +31358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31312,5 +31374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31324,5 +31386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31336,5 +31398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31344,5 +31406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31356,5 +31418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31368,6 +31430,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31377,5 +31439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31389,5 +31451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31401,5 +31463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31413,5 +31475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31425,5 +31487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31437,5 +31499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31445,7 +31507,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31455,5 +31517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31463,5 +31525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31471,5 +31533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31479,5 +31541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31494,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31505,5 +31567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31517,5 +31579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31529,5 +31591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31541,5 +31603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31550,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31558,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31566,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31574,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31582,5 +31644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31597,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31609,5 +31671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31621,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31633,5 +31695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31645,5 +31707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31658,5 +31720,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?
@@ -31682,5 +31744,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31691,11 +31753,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31705,5 +31767,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31713,5 +31775,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31721,5 +31783,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31729,5 +31791,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31737,5 +31799,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31745,5 +31807,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31753,5 +31815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31761,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31769,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31777,5 +31839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31785,5 +31847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31793,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31811,5 +31873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -31904,5 +31966,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -31910,28 +31972,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
@@ -32046,5 +32108,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32057,5 +32119,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>
@@ -32080,6 +32142,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32088,6 +32150,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32102,6 +32164,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
@@ -32115,6 +32177,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
@@ -32134,6 +32196,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32157,6 +32219,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
@@ -32214,4 +32276,5 @@
 #~ msgstr "البريد الإلكتروني"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "إتصل بــ {0}..."
@@ -32274,4 +32337,5 @@
 #~ msgstr "إختر أولاً إشارة مرجعية"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}"
@@ -32298,4 +32362,5 @@
 #~ msgstr "غير قادر على الإتصال بلمخدم."
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "المؤلفون: {0}"
@@ -32328,7 +32393,9 @@
 #~ 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} من ضمن المسلك."
@@ -32382,10 +32449,13 @@
 #~ 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}ث"
@@ -32403,13 +32473,17 @@
 #~ msgstr "علاقة متناقضة"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "غير قادر على فتح دليل التفضيلات: {0}"
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "للطريق ''{0}'' أقل من نقطتين."
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
@@ -32419,8 +32493,7 @@
 
 #~ 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"
@@ -32430,4 +32503,5 @@
 #~ msgstr "حمّل الخيار"
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "لم أتمكن من القراءة من الــ URL: \"{0}\""
@@ -32448,7 +32522,11 @@
 #~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "خطء عند تحميل الصفحة {0}"
 
+#~ msgid "Errors during Download"
+#~ msgstr "أخطاء عند التنزيل"
+
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Oberpfalz Geofabrik.de"
@@ -32478,4 +32556,5 @@
 #~ msgstr "مساعدة"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "تكدس الأوامر: {0}"
@@ -32531,13 +32610,15 @@
 
 #~ 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}'' أن يكون صفراً"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-05-16 12:49+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-02 08:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -262,6 +262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -316,6 +316,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>би могъл да се "
@@ -341,9 +341,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
@@ -434,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -647,12 +647,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1445,5 +1445,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1464,5 +1465,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1614,5 +1615,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Показва отчет на статуса с полезна информация, която може да бъде свързана с "
@@ -1636,5 +1638,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1778,6 +1780,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
@@ -1846,5 +1848,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Една точка, която се използва от няколко линии и една от тези линии, или"
@@ -1917,9 +1920,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)"
@@ -1936,5 +1939,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2225,7 +2228,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Грешки при Сваляне"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2259,6 +2262,6 @@
 msgstr "({0}/{1}) Зареждане на родителите на релация {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2393,6 +2396,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 ""
 "Влачете позицията на просвирване и пуснете близо до следата за да "
@@ -2520,68 +2523,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Търсене..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Търсене на обекти."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Моля въведете филтър."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Моля, въведете низ за търсене."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "замени селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "добави към селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "изтрий от селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "търсене в селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "чувствителност към регистъра"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "регулярен израз"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>Baker Street</b> - ''Baker'' и ''Street'' в кой да е ключ или име."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr ""
+"<b>Baker Street</b> - ''Baker'' и ''Street'' в кой да е ключ или име."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' където и да е в името."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - ключ ''type'' със стойност именно ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2591,38 +2595,39 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - няма ''Bak'' в името."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - ключ=foot, независимо от стойността."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Специални цели:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgstr ""
+"<b>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - всички обекти, променени от зададения потребител"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - обект с дадено ID (0 за нови обекти)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2630,5 +2635,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2636,11 +2641,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2648,5 +2653,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2654,41 +2663,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - всички променени обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - всички избрани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - всички непълни обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - всички немаркирани обекти"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+"<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+"<b>parent <i>израз</i></b> - всички родители на обектите отговарящи на израза"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr ""
+"Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>израз</i></b> - всички родители на обектите отговарящи на израза"
-
-#: ../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> за да обедините в логическо \"ИЛИ\""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2696,11 +2706,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Използвайте <b>(</b> и <b>)</b> за да групирате изрази"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2708,38 +2718,39 @@
 msgstr "Филтър"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Приемане на филтър"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Стартиране търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не е намерено съвпадение за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+msgstr ""
+"Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2747,5 +2758,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2753,5 +2764,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2759,5 +2770,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2776,5 +2787,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2782,10 +2801,5 @@
 "ключ=стойност."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2794,36 +2808,36 @@
 "връзка."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неочакван знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2887,5 +2901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3098,7 +3112,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 ""
 "Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
@@ -3374,6 +3388,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 ""
 
@@ -3458,5 +3472,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3465,5 +3479,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3472,5 +3486,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3507,5 +3521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3558,5 +3572,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3564,5 +3578,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3570,17 +3584,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Текст"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "Д"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3588,5 +3596,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3595,5 +3603,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3601,5 +3609,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3607,5 +3615,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3613,42 +3621,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Примитив с ID = 0 не може да бъде невидим."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Очаква се ID > 0. Имаме {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Очакваше се Version > 0. Имаме: {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3657,5 +3665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3663,5 +3671,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3717,5 +3725,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3725,81 +3734,81 @@
 msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Път, обознаващ граница на област, не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Повече от един път \"от\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Повече от един път \"до\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Повече от един \"през\" са открити."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестна роля ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестен тип членство за ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Не е намерен път \"от\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Не е намерен път \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Не е открит възел или път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стил за ограничение {0} не е намерен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стилът за външния път ''{0}'' се разминава."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Грешка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3973,8 +3982,9 @@
 #: ../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
@@ -4044,5 +4054,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4052,5 +4062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4059,5 +4069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4066,5 +4076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4073,5 +4083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4080,5 +4090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4087,9 +4097,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4232,5 +4242,6 @@
 #: ../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
@@ -4406,6 +4417,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4420,4 +4431,5 @@
 msgstr "Редактиране"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4560,5 +4572,6 @@
 #: ../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
@@ -4611,5 +4624,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4648,6 +4661,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 ""
 
@@ -4678,5 +4691,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 +4698,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 +4705,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"
@@ -4906,5 +4919,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4929,6 +4943,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4940,5 +4955,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Надолу"
@@ -4984,6 +4999,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 ""
 
@@ -4991,6 +5006,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 ""
 
@@ -5041,6 +5056,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 ""
 
@@ -5259,6 +5274,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5271,6 +5286,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5568,7 +5583,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 ""
 
@@ -5593,5 +5608,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5609,6 +5625,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5632,5 +5647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5638,5 +5653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5692,5 +5707,6 @@
 #: ../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
@@ -5709,9 +5725,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5729,13 +5746,13 @@
 msgstr "Разрешаване на конфликти за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5744,45 +5761,41 @@
 msgstr "Добави"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Редактиране на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "изтриване на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Преместване филтъра нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Преместване филтъра надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Разрешаване на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Скриване на елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Обръщане на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Режим на филтъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5813,5 +5826,6 @@
 #: ../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
@@ -6009,10 +6023,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6355,4 +6369,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7466,6 +7481,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 ""
 
@@ -7489,8 +7504,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 ""
 
@@ -7610,5 +7625,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7617,23 +7632,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Промени стойностите?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7642,5 +7657,5 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7649,77 +7664,81 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Изберете стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Моля, изберете обектите, чиито параметри искате да промените."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Параметри/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Параметри на избраните обекти"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Член на"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Промяна на връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Изтриване от връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7836,6 +7855,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 ""
 
@@ -7853,6 +7872,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 ""
 
@@ -8007,6 +8026,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8342,6 +8362,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8401,4 +8422,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8481,6 +8503,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 ""
 
@@ -8490,6 +8512,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 ""
 
@@ -8763,8 +8785,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Качването се <strong>провали</strong> понеже на сървъра има по-нова "
@@ -8772,7 +8795,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>"
 
@@ -8787,13 +8810,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Качването <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
@@ -9030,5 +9054,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9045,5 +9069,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Слоят ''{0}'' съдържа промени, които трябва да бъдат качени на сървъра."
@@ -9129,6 +9154,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] ""
@@ -9142,6 +9167,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 "
@@ -9367,5 +9392,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9391,5 +9416,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9410,6 +9436,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
@@ -9422,9 +9448,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
@@ -9434,6 +9460,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
@@ -9453,6 +9479,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>няколко списъка с "
@@ -9508,7 +9534,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 ""
 
@@ -9518,5 +9544,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9541,5 +9567,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9757,7 +9784,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 ""
 
@@ -9783,7 +9810,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 ""
 
@@ -9847,9 +9874,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -9862,5 +9889,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10030,6 +10057,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 ""
 
@@ -10089,7 +10116,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>Покажете "
@@ -10159,64 +10186,68 @@
 msgstr "Авто-отгатване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Часова зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Отместване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Съпоставяне на изображения с GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Корелнутииране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Невалидна часова зона"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Невалидно отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10226,20 +10257,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часови пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минути: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10248,5 +10279,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10254,21 +10285,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Съотнасянето на снимки към следа се провали"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Настройване часови пояс и отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Избраните снимки не съдържат времева информация."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Снимките не съдържат времева информация"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10276,17 +10307,17 @@
 msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX следата няма информация за времето"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Трябва да изберете GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Няма избрана GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10297,5 +10328,5 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10348,14 +10379,14 @@
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Корелиране към GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10364,5 +10395,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10371,10 +10402,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10383,5 +10414,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10678,6 +10709,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 ""
 
@@ -10699,8 +10730,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 ""
 
@@ -10820,6 +10851,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 ""
 
@@ -10929,5 +10960,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11061,8 +11093,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 ""
 
@@ -11145,8 +11177,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 ""
 
@@ -11173,7 +11205,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 ""
 
@@ -11245,14 +11277,10 @@
 msgstr "Показване на живо на аудио следата."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Създаване на не-аудио маркери при четене GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Изрично изискване точки в следата да са с валидно време."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
@@ -11260,21 +11288,21 @@
 "позиция."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Наименовани точки от следата."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Променени времена на аудио файлове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Начало на следа (винаги ще се прави, ако няма други маркери)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Покажи или скрий аудио менюто в главното меню."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11284,5 +11312,5 @@
 "следа, където текущо възпроизвежащния аудио запис е бил записан."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11292,23 +11320,15 @@
 "техните бутони-икони."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Автоматично създаване на слой с маркери от всяка точка на интерес при "
-"отваряне на GPX слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "При импорт на аудио, създай маркери от..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "При импорт на аудио, приложи го към всяка точка от GPX слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11318,5 +11338,5 @@
 "точки на интерес) с имена или описания."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11326,5 +11346,5 @@
 "време на всеки импортиран аудио WAV файл."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11334,17 +11354,17 @@
 "съответния бутон."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Време пренавиване (секунди)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Показване, колко пъти ще се увеличи скорост при бързо прослушване"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Множител за бързо прослушване"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11354,13 +11374,13 @@
 "число) посочената позицията в аудио записа"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Продължителност на встъплението (секунди)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "Съотношение на времето със записан глас към цялото изминало време"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Калибровка на звукозаписа"
@@ -11400,5 +11420,5 @@
 msgstr "Цветове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11409,35 +11429,35 @@
 msgstr "Всички"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Само локални файлове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Никога"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Изобразвай линии, даже и ако не са импортирани сегменти."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Изобразявай големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорост (червено = бавно, зелено = бързо)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -11445,5 +11465,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11465,5 +11485,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11505,5 +11525,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11517,51 +11537,63 @@
 msgstr "Пеш"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Изобразвай направлението със стрелки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Бързо изрисуване (изглежда по-зле)"
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Само интересните указатели на посока (примерно, при еднопосочни пътища)."
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-"Само интересните указатели на посока (примерно, при еднопосочни пътища)."
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Само в началото на път."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Показвай поредния номер на сегментите"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Изобразвай границите на свалените данни."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Изобразявай виртуални възли в режим на избор."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Изобразявай неактивните слоеве в друг цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Изглаждане на линиите (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Автоматично създаване на слой с маркери от всяка точка на интерес при "
+"отваряне на GPX слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Свързване с линии на GPS точките"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11571,9 +11603,9 @@
 "Задайте ''-1'' за чертаене на всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Максимална дължина за локални файлове (метри)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11582,21 +11614,22 @@
 "се рисуват всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Максимална дължина (в метри)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Изобразвай стрелки с посоката, използвайки таблици вместо математически "
@@ -11604,5 +11637,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11611,13 +11644,13 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Минимално разстояние (в пиксели)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Рисуване на по-големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11627,9 +11660,9 @@
 "в мениджър слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Оцветяване точките от следите според скоростта."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11637,5 +11670,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -11643,33 +11676,34 @@
 "скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Оцветяване на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Показване на направлението на сегментите на пътя."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показване поредните номера на всички сегменти на пътя."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Приложи изглаждане върху картата."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Изобразяване границата на свалената от сървъра област."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11678,9 +11712,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Изобразяване неактивните слоеве с данни в други цветове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM Данни"
@@ -11752,5 +11786,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11799,6 +11834,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11875,6 +11910,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 ""
 
@@ -11887,9 +11922,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 ""
 
@@ -11912,6 +11947,6 @@
 "encountered.</p>"
 msgstr ""
-"<p>Псевдо-модификатор ''изключено'' ще изключва бърза клавишна комбинация.</"
-"p>"
+"<p>Псевдо-модификатор ''изключено'' ще изключва бърза клавишна "
+"комбинация.</p>"
 
 #. scroll up
@@ -12190,6 +12225,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 ""
 
@@ -12311,6 +12346,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 ""
 
@@ -12332,6 +12367,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 ""
 
@@ -12409,5 +12444,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12423,5 +12459,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12515,6 +12552,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 ""
 
@@ -12810,5 +12847,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
@@ -12993,5 +13030,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13376,6 +13414,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 ""
 
@@ -13403,6 +13441,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 ""
 
@@ -13446,5 +13484,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13875,14 +13914,20 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13891,23 +13936,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13915,5 +13955,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13921,17 +13961,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13939,5 +13979,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13949,42 +13989,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Изключване на разширение"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Запазване на добавка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13993,5 +14033,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14000,10 +14040,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14013,10 +14053,10 @@
 "\"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Съгласно информацията в добавката, авторът е {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14025,9 +14065,9 @@
 "за грешка."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Разширението да бъде ли изключено?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14037,14 +14077,14 @@
 "да изключим разширенето."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Информация за добавка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "няма описание"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14085,5 +14125,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14145,5 +14186,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"
@@ -14204,6 +14245,6 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Пропадна инициализацията на връзката със сървъра на OSM {0}."
-"<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
+"<html>Пропадна инициализацията на връзката със сървъра на OSM "
+"{0}.<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
 "Интернет.</html>"
 
@@ -14229,6 +14270,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 ""
 
@@ -14236,7 +14277,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 ""
 
@@ -14244,7 +14285,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 ""
 
@@ -14252,8 +14293,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 ""
 
@@ -14273,7 +14314,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 ""
 
@@ -14342,6 +14383,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14353,7 +14395,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 ""
 
@@ -14385,9 +14427,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15054,7 +15096,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15064,5 +15106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15072,5 +15114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15086,5 +15128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15094,5 +15136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15123,5 +15165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15130,5 +15172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15137,5 +15179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15144,5 +15186,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15151,5 +15193,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15158,5 +15200,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15190,17 +15232,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"Специален доставчик на френски кадастров 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 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> преди да качвате каквито и да са данни създадени с това разширение."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -15688,34 +15732,35 @@
 msgstr "Грешка в кеширането на Ламбертовата зона"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Използване"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Моля, изберете схема за използване."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Цветова схема"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Моля, изберете схема за изтриване."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Изполвайте избраната от списъка схема."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Използвайте текущите цветове като нова цветова схема."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Изтриване на избраната схема от списъка."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Цветни схеми"
@@ -15790,5 +15835,5 @@
 msgstr "Слой за редактиране на GPX следи"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Преобразуване към GPX слой с анонимно време"
@@ -15879,4 +15924,5 @@
 msgstr "Порт:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16089,5 +16135,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16208,5 +16254,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Максимален брой сегменти в създаваните линии. По подразбиране 250."
 
@@ -16229,6 +16276,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Точност на алгоритъма на Douglas-Peucker за опростяване на линии, измервана "
@@ -16547,5 +16595,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Заглавната част съдържа няколко стойности и не може да бъде представена с "
@@ -16661,5 +16710,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16675,5 +16725,6 @@
 #: ../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
@@ -16712,5 +16763,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17297,5 +17349,6 @@
 #: ../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
@@ -17537,4 +17590,12 @@
 msgid "Terrace"
 msgstr "Разделяне на сграда"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -17980,6 +18041,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 ""
 
@@ -18065,8 +18126,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 ""
 
@@ -18120,8 +18181,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 ""
 
@@ -18233,6 +18294,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 ""
 
@@ -18240,6 +18301,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 ""
 
@@ -18888,6 +18949,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"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 "
@@ -19038,5 +19100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19138,5 +19200,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19519,9 +19581,6 @@
 msgstr "файлове WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19532,10 +19591,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Базата данни е недостъпна заради поддръжка"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19545,25 +19604,25 @@
 "област. Или я намалете, или използвайте planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "Не може да се достъпи входния аудио поток от входното URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Аудио устройството е недостъпно"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Трябва да направите редакциите си публични за да качвате нови данни"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19571,17 +19630,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "гора"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19589,7 +19648,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19599,5 +19658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19640,5 +19699,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19648,5 +19707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19656,5 +19715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19664,8 +19723,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19679,5 +19738,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19688,5 +19747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19695,7 +19754,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19705,5 +19764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19713,5 +19772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19721,5 +19780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19729,5 +19788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19737,5 +19796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19745,5 +19804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19753,8 +19812,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19764,59 +19823,60 @@
 msgstr "маршрут"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Незадължителни Атрибути:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "без модификатор"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Режим на филтъра"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Стълби за преминаване през ограда"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Тип на линия"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Домашна страница"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "Даосизъм"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Увеличаване"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Нова роля"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Създаване нов възел."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Запазване"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19894,5 +19954,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM."
 
@@ -20080,6 +20141,13 @@
 msgstr "Създава терасовидни къщи от един блок."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20088,5 +20156,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20095,10 +20163,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20110,5 +20178,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20118,5 +20186,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20125,15 +20193,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20142,5 +20210,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21030,7 +21098,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21170,8 +21238,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"/>
@@ -21381,5 +21449,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21389,5 +21457,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21406,5 +21474,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21414,5 +21482,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21431,5 +21499,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21439,5 +21507,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21456,5 +21524,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21464,5 +21532,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21477,5 +21545,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21493,5 +21561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21509,5 +21577,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21516,5 +21584,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21524,5 +21592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21542,5 +21610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21549,5 +21617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21557,5 +21625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22259,5 +22327,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22308,5 +22376,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22403,5 +22471,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22569,5 +22637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22901,5 +22969,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22909,5 +22977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22917,5 +22985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22925,5 +22993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22933,5 +23001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22941,5 +23009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22949,5 +23017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22958,5 +23026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24376,5 +24444,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24384,5 +24452,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24392,5 +24460,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24400,5 +24468,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24762,7 +24830,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24772,5 +24840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24780,5 +24848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24788,5 +24856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24796,5 +24864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24804,5 +24872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24812,5 +24880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24820,5 +24888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24828,5 +24896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24836,5 +24904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24844,5 +24912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24852,5 +24920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24860,5 +24928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24868,5 +24936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24876,5 +24944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24884,5 +24952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24892,5 +24960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24900,5 +24968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24908,5 +24976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24916,5 +24984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24924,5 +24992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24932,5 +25000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24940,5 +25008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24948,5 +25016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24956,5 +25024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24964,5 +25032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24972,5 +25040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24980,5 +25048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24988,5 +25056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24996,5 +25064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25004,5 +25072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25012,5 +25080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25020,5 +25088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25028,5 +25096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25036,5 +25104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25044,5 +25112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25052,5 +25120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25060,5 +25128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25068,5 +25136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25076,5 +25144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25084,5 +25152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25092,5 +25160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25100,5 +25168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25108,5 +25176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25116,5 +25184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25124,5 +25192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25132,5 +25200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26836,7 +26904,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26846,5 +26914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26854,5 +26922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26862,5 +26930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26870,5 +26938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26878,5 +26946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26886,5 +26954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26894,5 +26962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26902,5 +26970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28323,5 +28391,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28337,5 +28405,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28345,5 +28413,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28354,5 +28422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28365,7 +28433,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28375,5 +28443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28383,5 +28451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28391,5 +28459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28399,5 +28467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28431,5 +28499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28445,5 +28513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28453,5 +28521,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28460,5 +28528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28468,5 +28536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28477,5 +28545,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28500,5 +28568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28613,9 +28681,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
@@ -28623,5 +28691,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,
@@ -28631,8 +28699,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
@@ -28646,5 +28714,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28652,5 +28720,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28699,6 +28767,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>
@@ -28778,5 +28846,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28786,11 +28854,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28806,5 +28874,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28813,5 +28881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28820,5 +28888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28834,5 +28902,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28846,5 +28914,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28853,5 +28921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28860,5 +28928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28867,5 +28935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28874,5 +28942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28881,5 +28949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28888,5 +28956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28895,5 +28963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28902,5 +28970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28909,5 +28977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28916,5 +28984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28923,5 +28991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28930,5 +28998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28937,5 +29005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28944,5 +29012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29119,7 +29187,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29133,5 +29201,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29141,7 +29209,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29151,5 +29219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29159,5 +29227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29167,5 +29235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29175,5 +29243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29189,5 +29257,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29196,5 +29264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29204,5 +29272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29211,5 +29279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29218,5 +29286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29225,5 +29293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29232,5 +29300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29239,5 +29307,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29246,5 +29314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29253,5 +29321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29260,5 +29328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29267,5 +29335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29279,5 +29347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29291,5 +29359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29298,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29310,5 +29378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29323,5 +29391,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29336,5 +29404,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29348,5 +29416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29360,5 +29428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29367,5 +29435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29374,5 +29442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29382,5 +29450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29389,5 +29457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29396,5 +29464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29403,5 +29471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29411,5 +29479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29420,5 +29488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29428,7 +29496,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29438,5 +29506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29446,5 +29514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29454,5 +29522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29463,5 +29531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29470,5 +29538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29478,5 +29546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29486,5 +29554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29494,5 +29562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29502,5 +29570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29510,5 +29578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29518,5 +29586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29526,5 +29594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29534,5 +29602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29542,5 +29610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29563,5 +29631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29576,7 +29644,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29586,5 +29654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29593,5 +29661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29601,5 +29669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29608,5 +29676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29616,5 +29684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29624,5 +29692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29638,5 +29706,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29647,5 +29715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29664,5 +29732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29672,5 +29740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29683,5 +29751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29700,5 +29768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29707,5 +29775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29714,5 +29782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29721,7 +29789,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29732,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29745,5 +29813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29757,5 +29825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29765,5 +29833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29777,5 +29845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29789,5 +29857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29796,5 +29864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29803,7 +29871,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29813,5 +29881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29821,5 +29889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29829,5 +29897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29837,5 +29905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29845,5 +29913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29859,7 +29927,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29874,5 +29942,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29887,5 +29955,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29900,5 +29968,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29913,5 +29981,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29926,5 +29994,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29939,7 +30007,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29949,5 +30017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29956,5 +30024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29964,5 +30032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29972,5 +30040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29980,5 +30048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29988,5 +30056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29996,5 +30064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30004,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30012,5 +30080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30020,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30028,5 +30096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30036,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30044,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30062,5 +30130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30075,5 +30143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30086,7 +30154,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30096,5 +30164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30104,5 +30172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30112,5 +30180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30120,5 +30188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30128,5 +30196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30136,5 +30204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30144,5 +30212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30152,5 +30220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30160,5 +30228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30168,5 +30236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30176,5 +30244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30184,5 +30252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30192,5 +30260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30200,5 +30268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30208,5 +30276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30216,5 +30284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30236,5 +30304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30248,7 +30316,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30258,5 +30326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30266,5 +30334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30274,5 +30342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30282,5 +30350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30290,5 +30358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30298,5 +30366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30306,5 +30374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30314,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30322,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30330,5 +30398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30347,5 +30415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30355,5 +30423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30363,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30371,5 +30439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30379,5 +30447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30387,5 +30455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30395,5 +30463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30403,5 +30471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30411,5 +30479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30419,5 +30487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30427,5 +30495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30435,5 +30503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30452,5 +30520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30459,5 +30527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30467,5 +30535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30474,5 +30542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30482,5 +30550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30490,5 +30558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30498,5 +30566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30505,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30513,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30521,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30529,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30537,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30544,5 +30612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30551,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30558,5 +30626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30565,5 +30633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30572,5 +30640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30579,5 +30647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30586,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30593,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30600,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30607,5 +30675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30614,5 +30682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30621,5 +30689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30628,5 +30696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30636,5 +30704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30644,5 +30712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30652,5 +30720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30660,5 +30728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30668,5 +30736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30676,5 +30744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30684,5 +30752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30692,5 +30760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30700,5 +30768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30709,5 +30777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30717,5 +30785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30725,5 +30793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30733,5 +30801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30741,5 +30809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30749,5 +30817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30757,5 +30825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30765,5 +30833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30773,5 +30841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30781,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30789,5 +30857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30797,5 +30865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30805,5 +30873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30813,5 +30881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30821,5 +30889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30829,5 +30897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30837,5 +30905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30845,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30853,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30861,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30868,5 +30936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30898,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30906,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30914,7 +30982,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30929,5 +30997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30937,5 +31005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30945,5 +31013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30953,5 +31021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30961,5 +31029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30969,5 +31037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30977,5 +31045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30991,7 +31059,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31001,5 +31069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31009,5 +31077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31017,5 +31085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31025,5 +31093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31033,5 +31101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31041,5 +31109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31049,5 +31117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31057,5 +31125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31065,5 +31133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31073,5 +31141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31081,5 +31149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31089,5 +31157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31097,5 +31165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31105,5 +31173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31113,5 +31181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31121,5 +31189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31129,5 +31197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31137,5 +31205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31145,5 +31213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31153,5 +31221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31161,5 +31229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31169,5 +31237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31177,5 +31245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31185,5 +31253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31193,5 +31261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31201,5 +31269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31209,5 +31277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31217,5 +31285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31225,5 +31293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31233,5 +31301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31241,5 +31309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31249,5 +31317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31257,5 +31325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31265,5 +31333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31273,5 +31341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31281,5 +31349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31289,5 +31357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31297,5 +31365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31305,5 +31373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31313,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31321,5 +31389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31329,5 +31397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31363,7 +31431,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31373,5 +31441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31381,5 +31449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31389,5 +31457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31397,5 +31465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31405,5 +31473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31413,5 +31481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31421,5 +31489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31436,5 +31504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31444,5 +31512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31452,5 +31520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31460,5 +31528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31468,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31476,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31485,5 +31553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31493,5 +31561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31501,5 +31569,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31509,5 +31577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31516,5 +31584,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31523,5 +31591,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31539,7 +31607,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31549,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31557,5 +31625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31565,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31573,5 +31641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31581,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31589,5 +31657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31597,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31605,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31613,5 +31681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31629,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31641,5 +31709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31653,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31661,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31673,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31685,6 +31753,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31694,5 +31762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31706,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31718,5 +31786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31730,5 +31798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31742,5 +31810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31754,5 +31822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31762,7 +31830,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31772,5 +31840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31780,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31788,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31796,5 +31864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31811,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31822,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31834,5 +31902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31846,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31858,5 +31926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31867,5 +31935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31875,5 +31943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31883,5 +31951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31891,5 +31959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31899,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31914,5 +31982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31926,5 +31994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31938,5 +32006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31950,5 +32018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31962,5 +32030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31975,5 +32043,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?
@@ -31999,5 +32067,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32008,11 +32076,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32022,5 +32090,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32030,5 +32098,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32038,5 +32106,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32046,5 +32114,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32054,5 +32122,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32062,5 +32130,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32070,5 +32138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32078,5 +32146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32086,5 +32154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32094,5 +32162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32102,5 +32170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32110,5 +32178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32128,5 +32196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32221,5 +32289,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32227,28 +32295,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
@@ -32363,5 +32431,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32374,5 +32442,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>
@@ -32397,6 +32465,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32405,6 +32473,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32419,6 +32487,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
@@ -32432,6 +32500,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
@@ -32451,6 +32519,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32474,6 +32542,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
@@ -32486,4 +32554,5 @@
 msgstr "Сицилия - Италия"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32495,4 +32564,5 @@
 #~ " {0}"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32500,7 +32570,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} изглежда повредено или не може да бъде свалено автоматично."
@@ -32513,4 +32583,5 @@
 #~ "повторете опита си по-късно."
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни"
@@ -32537,4 +32608,5 @@
 #~ msgstr "Намерен е елемент <nd> извън път."
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
@@ -32561,4 +32633,5 @@
 #~ msgstr "Неправилен код на точка"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
@@ -32569,6 +32642,6 @@
 #~ msgstr ""
 #~ "(Може да промените броя дни преди да се появи това предупреждение "
-#~ "отново<br>чрез задаването на конфигурационната опция 'pluginmanager."
-#~ "warntime'.)"
+#~ "отново<br>чрез задаването на конфигурационната опция "
+#~ "'pluginmanager.warntime'.)"
 
 #~ msgid "Unsaved Changes"
@@ -32602,13 +32675,14 @@
 #~ 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:"
@@ -32617,6 +32691,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Укажете последователността от действия, която предизвика грешката "
-#~ "(колкото се може по-подробно!)"
+#~ "Укажете последователността от действия, която предизвика грешката (колкото "
+#~ "се може по-подробно!)"
 
 #~ msgid "x from"
@@ -32647,7 +32721,9 @@
 #~ msgstr "Невъзможно да се установи връзка със сървъра."
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Автори: {0}"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Слоеве: {0}"
@@ -32656,4 +32732,5 @@
 #~ msgstr "Разрешяване конфликти."
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Списък промени: {0}"
@@ -32662,4 +32739,5 @@
 #~ msgstr "име"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Изображения за {0}"
@@ -32668,10 +32746,13 @@
 #~ 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}"
@@ -32685,4 +32766,5 @@
 #~ msgstr "Изображение"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} в пределите на следата"
@@ -32721,4 +32803,5 @@
 #~ msgstr "оправена версия:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32844,6 +32927,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 "
@@ -32860,6 +32943,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"
@@ -32884,6 +32967,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"
@@ -32904,4 +32987,5 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -32955,7 +33039,9 @@
 #~ msgstr "Моля задайте низ за търсене"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Използване шаблон ''{0}'' от група ''{1}''"
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Използване шаблон ''{0}''"
@@ -32980,6 +33066,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 ""
 #~ "Възстановяване състоянието на всички текущо избрани обекти до версията, "
@@ -32998,7 +33084,9 @@
 #~ 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}"
@@ -33007,4 +33095,5 @@
 #~ msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
 
+#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Не е указано време за точка {0} x {1}"
@@ -33035,7 +33124,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."
@@ -33045,4 +33133,7 @@
 #~ msgstr "Използване на прокси-сървър"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Създаване на не-аудио маркери при четене GPX."
+
 #~ msgid "<p>Thank you for your understanding</p>"
 #~ msgstr "<p>Благодарим за разбирането</p>"
@@ -33052,6 +33143,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33063,6 +33153,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 има "
@@ -33079,19 +33169,25 @@
 #~ msgstr "Разширението вече съществува"
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ 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 "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}'' се намира отвън."
@@ -33100,7 +33196,9 @@
 #~ 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 "
@@ -33109,12 +33207,14 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да "
-#~ "се се изтрие съществуващия архив?\n"
+#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да се "
+#~ "се изтрие съществуващия архив?\n"
 #~ "\n"
 #~ "{0}"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Не може да се отвори директорията с предпочитания: {0}"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33145,13 +33245,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>Наистина ли искате да "
-#~ "ги триете?"
-
+#~ "Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
+#~ "от сървъра.<br>Това може да предизвика проблеми, защото други обекти (които "
+#~ "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
+
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
@@ -33164,9 +33264,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"
@@ -33186,6 +33286,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 ""
 #~ "Вътрешна грешка: невъзможно да се проверят условията без слой. Моля, "
@@ -33195,10 +33295,13 @@
 #~ 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}\""
@@ -33209,6 +33312,5 @@
 #~ 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"
@@ -33234,4 +33336,5 @@
 #~ "Възможно е да се редактират само справочните страници на JOSM Online Help"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Грешка при зареждане на страница {0}"
@@ -33268,14 +33371,12 @@
 #~ msgstr "Сигурни ли сте?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
 #~ msgstr[0] ""
 #~ "Селекцията се състои от {0} път. Сигурни ли сте че искате да го опростите?"
 #~ msgstr[1] ""
-#~ "Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги "
-#~ "опростите?"
+#~ "Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги опростите?"
 
 #~ msgid "All images"
@@ -33361,4 +33462,5 @@
 #~ msgstr "Преместване нагоре"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Редактор релации: {0}"
@@ -33371,4 +33473,5 @@
 #~ "имат история."
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Променете първо проекцията до {0}."
@@ -33377,14 +33480,16 @@
 #~ 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}"
@@ -33394,16 +33499,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 следата. Може "
-#~ "да промените настройките на ръчно съотнасяне на снимки."
-
+#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може да "
+#~ "промените настройките на ръчно съотнасяне на снимки."
+
+#, java-format
 #~ 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 ""
 #~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с "
@@ -33412,4 +33517,7 @@
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Следните грешки възникнаха при масово сваляне:"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Грешки при Сваляне"
 
 #~ msgid "Edit Information Office"
@@ -33453,19 +33561,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 ""
 #~ "Инструменти за работа с автори/потребители. Избиране картови данни, които "
@@ -33477,9 +33585,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"
@@ -33498,4 +33606,5 @@
 #~ msgstr "Не може да се прочетат числова стойност от отговора"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33516,4 +33625,5 @@
 #~ msgstr "Възстановяне от изтриване на път..."
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Проверка дали възел {0} е заминал..."
@@ -33522,7 +33632,9 @@
 #~ 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}\""
@@ -33531,4 +33643,5 @@
 #~ msgstr "Конфликт в данните"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33553,4 +33666,5 @@
 #~ msgstr "Обновяване на примитива."
 
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -33566,4 +33680,5 @@
 #~ msgstr "Забелязан е конфликт."
 
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr ""
@@ -33577,4 +33692,8 @@
 #~ msgstr "Примитивът вече е изтрит."
 
+#, java-format
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!"
+
 #~ msgid "Error while communicating with server."
 #~ msgstr "Грешка по време на връзката със сървъра."
@@ -33586,4 +33705,5 @@
 #~ msgstr "точки"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33592,6 +33712,6 @@
 #~ msgstr ""
 #~ "<html>Качването <strong>пропадна</strong> защото примитивът, който се "
-#~ "опитахте<br> да изтриете на съсрвъра вече е изтрит там."
-#~ "<br><br>Съобщението за грешка е:<br>{0}</html>"
+#~ "опитахте<br> да изтриете на съсрвъра вече е изтрит там.<br><br>Съобщението "
+#~ "за грешка е:<br>{0}</html>"
 
 #~ msgid "Deleted or moved primitives"
@@ -33601,20 +33721,23 @@
 #~ 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}"
@@ -33644,4 +33767,5 @@
 #~ msgstr "Копиране на подразбиращите се"
 
+#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Добавката {0} не е достъпна. Обновяването е пропуснато."
@@ -33650,10 +33774,11 @@
 #~ 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 ""
 #~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, "
@@ -33666,7 +33791,9 @@
 #~ 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."
@@ -33674,4 +33801,5 @@
 #~ "Зареждането на добавката {0} беше заявено, но тя не се изисква повече."
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Добавката не е открита: {0}."
@@ -33683,4 +33811,5 @@
 #~ msgstr "Използване на нов списък с промени и затваряне"
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -33695,8 +33824,10 @@
 #~ 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 ""
@@ -33713,42 +33844,48 @@
 #~ 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>"
-
+#~ "<html>Има неразрешени конфликти в слой ''{0}''.<br>Трябва да ги "
+#~ "разрешите.</html>"
+
+#, 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"
-
+#~ "Некоректна стойност на оператора за възли: {0}. Операторът за възли очаква "
+#~ "числова стойност, възел или диапазон, например, 10-20"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием "
-#~ "ли от релацията?</html>"
-
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием ли "
+#~ "от релацията?</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>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да "
-#~ "го изтрием ли от релацията?</html>"
-
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да го "
+#~ "изтрием ли от релацията?</html>"
+
+#, java-format
 #~ 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>."
@@ -33757,22 +33894,27 @@
 
 #~ 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>."
+
+#, java-format
 #~ 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}''"
@@ -33790,7 +33932,9 @@
 #~ 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}"
@@ -33799,13 +33943,17 @@
 #~ msgstr "Показване историята на избрания примитив"
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Не може да се прочете \"{0}\""
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ 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}'' не трябва да е празен."
@@ -33813,2 +33961,6 @@
 #~ msgid "Replace"
 #~ msgstr "Замяна"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "Д"
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 21603)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 21:00+0000\n"
-"Last-Translator: Jezevec <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 13:27+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\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-02 08:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +263,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -317,6 +317,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 "
@@ -342,9 +342,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
@@ -435,6 +435,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -647,12 +647,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1218,5 +1218,6 @@
 #, 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
@@ -1449,5 +1450,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1468,5 +1470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1618,5 +1620,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Zobrazit zprávu o stavu s užitečnými informacemi, které se mohou přiložit k "
@@ -1640,5 +1643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1782,7 +1785,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
@@ -1851,5 +1854,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo"
@@ -1923,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)"
@@ -1942,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:1037
@@ -2233,7 +2237,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Chyby při stahování"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Chyby během stahování"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2269,7 +2273,7 @@
 msgstr "({0}/{1}) Nahrávám rodiče relace {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Chyby během stahování"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2402,6 +2406,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 ""
 
@@ -2528,70 +2532,70 @@
 msgstr "<konec-souboru>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Hledat..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Hledat objekty."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Prosím zadejte řetězec filtru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Zadjte hledaný řetězec."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Zadejte hledaný výraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "nahradit označené"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "přidat k výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "odebrat z výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "Najít ve výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "velikost písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regulární výraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - ''Baker'' a ''Street'' v jakémkoliv klíči nebo jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - ''Baker Street'' v jakémkoliv klíči nebo jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' kdekoliv ve jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - klíč ''type'' s hodnotou přesně 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2601,30 +2605,31 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - neobsahuje ''Bak'' ve jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - klíč 'foot' nastavený na jakoukoliv hodnotu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciální cíle:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgstr ""
+"<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - všechny objekty změněné uživatelem"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
@@ -2632,9 +2637,9 @@
 "uživatelem"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt s daným ID (0 pro nové objekty)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2643,5 +2648,5 @@
 "<b>verze:</b>... - objekt s danou verzí (0 objektů bez přidělené verze)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2649,11 +2654,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2661,5 +2666,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2667,21 +2676,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všechny změněné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všechny vybrané objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>nekompletní</b> - všechny nekompletní objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všechny objekty bez tagů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2689,5 +2698,5 @@
 "<b>child <i>výraz</i></b> - všechny podobjekty objektů odpovídajících výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2695,14 +2704,14 @@
 "<b>parent <i>výraz</i></b> - všechny rodiče objektů odpovídajících výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 "Použíjte <b>\"</b> k uvození operátorů (např. když klíč obsahuje <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2710,11 +2719,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2722,38 +2731,38 @@
 msgstr "Filtrovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Hledat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Přidat filtr"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Začít hledání"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nebyly nalezeny záznamy pro \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Ve výběru se nenašlo nic při hledání ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2761,5 +2770,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2767,5 +2776,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2773,5 +2782,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2789,5 +2798,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2795,46 +2812,41 @@
 "klíč=hodnota"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočekávaný token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Chybí parametr pro NEBO"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Chybějící operátor pro NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Očekáváno ID prvku"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Číselný rozsah byl překročen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Očekáváno ID sady změn"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Očekávána verze"
@@ -2903,5 +2915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3116,11 +3128,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:459
@@ -3389,6 +3401,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 ""
 
@@ -3474,5 +3486,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3481,5 +3493,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3488,5 +3500,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3523,5 +3535,5 @@
 msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3574,5 +3586,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3580,5 +3592,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3586,17 +3598,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr ""
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3604,5 +3610,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3611,5 +3617,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3617,5 +3623,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3623,5 +3629,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3629,43 +3635,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtrování je aktivní</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektů skryto"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objektů deaktivováno"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Uzavřete filtrovací dialog pro zobrazení všech objektů.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "objekt s id=0 nemůže být neviditelný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "očekáváno id > 0. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "očekávána verze > 0. Nalezena {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3674,5 +3680,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3680,5 +3686,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3737,5 +3743,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3745,81 +3752,81 @@
 msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Nalezena více než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Nalezeno více cílových \"to\" cest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámý typ prvku pro ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Styl pro omezení {0} nenalezen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Styl pro vnější cestu ''{0}'' nesedí."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Chyba: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3993,5 +4000,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>Nelze načíst záložky z<br>''{0}''<br>Chyba: {1}</html>"
 
@@ -4063,5 +4071,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4071,5 +4079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4078,5 +4086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4085,5 +4093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4092,5 +4100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4099,5 +4107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4106,9 +4114,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4426,6 +4434,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4440,4 +4448,5 @@
 msgstr "Upravit"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4575,5 +4584,6 @@
 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
@@ -4637,5 +4647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4676,6 +4686,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 "
@@ -4710,5 +4720,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"
@@ -4717,5 +4727,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"
@@ -4724,5 +4734,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"
@@ -4891,5 +4901,6 @@
 "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
@@ -4922,5 +4933,6 @@
 "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
@@ -4939,6 +4951,8 @@
 
 #: ../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
@@ -4966,6 +4980,7 @@
 msgstr "Kopírovat všechny cizí elementy do cíle"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4977,5 +4992,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Dolu"
@@ -5020,6 +5035,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 "
@@ -5029,6 +5044,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 "
@@ -5081,12 +5096,14 @@
 #: ../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
@@ -5258,6 +5275,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
@@ -5276,5 +5293,6 @@
 #: ../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
@@ -5306,6 +5324,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5318,6 +5336,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5579,7 +5597,8 @@
 "<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
@@ -5624,7 +5643,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 "
@@ -5651,5 +5670,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr "Stáhnout informace o vybraných sadách změn z OSM serveru"
 
@@ -5667,6 +5687,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5690,5 +5709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5696,5 +5715,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5769,9 +5788,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5789,13 +5809,13 @@
 msgstr "Vyřešit konflikty pro ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtruje objekty a schová/zneaktivní je."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5804,45 +5824,41 @@
 msgstr "Přidat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Přidat filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Upravit filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Smazat filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Přesunout filtr nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Přesunout filtr dolu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Aktivovat filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Skrýt elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Aplikovat také na potomky"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Negovat filtr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Mód filtrování"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6069,10 +6085,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Vybrat relaci v seznamu relací."
@@ -6420,4 +6436,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7536,6 +7553,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 ""
 
@@ -7559,8 +7576,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 ""
 
@@ -7680,5 +7697,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7687,23 +7704,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7713,5 +7730,5 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7721,77 +7738,81 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Vybrat relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7910,6 +7931,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 "
@@ -7930,6 +7951,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 "
@@ -7948,11 +7969,12 @@
 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
@@ -8094,6 +8116,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8430,6 +8453,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8489,4 +8513,5 @@
 msgstr "Dotazuji se jmeného serveru ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8555,5 +8580,6 @@
 #, 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
@@ -8569,13 +8595,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
@@ -8584,6 +8610,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 "
@@ -8780,5 +8806,6 @@
 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
@@ -8862,8 +8889,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Aktualizace <strong>selhala</strong>, protože na serveru je novější "
@@ -8885,13 +8913,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9135,5 +9164,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9150,5 +9179,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr "Vrstva ''{0}'' má změny, které by měly být nahrány na server."
 
@@ -9235,6 +9265,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] ""
@@ -9248,6 +9278,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 "
@@ -9477,5 +9507,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9505,5 +9535,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr "Sada změn bude po nahrání na server <strong>uzavřena</strong>."
 
@@ -9571,6 +9602,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> "
@@ -9626,7 +9657,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 ""
 
@@ -9636,5 +9667,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9662,5 +9693,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9882,7 +9914,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 ""
 
@@ -9908,7 +9940,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 ""
 
@@ -9974,9 +10006,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -9989,5 +10021,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10077,5 +10109,6 @@
 #: ../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
@@ -10171,6 +10204,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 ""
 
@@ -10234,7 +10267,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 "
@@ -10304,64 +10337,68 @@
 msgstr "Auto-odhad"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Posun:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Korelovat obrázky s GPX trasou"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Korelovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Nepatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Neplatný posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10371,20 +10408,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časová zóna: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuty: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekundy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10393,5 +10430,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10399,21 +10436,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Zvolené fotografie neobsahují informace o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Fotografie neobsahují informace o čase"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10421,17 +10458,17 @@
 msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX trasa neobsahuje časové údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Měli byste vybrat GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Není vybrána GPX trasa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10442,5 +10479,5 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10493,14 +10530,14 @@
 msgstr "Chyba při získávání souborů z adresáře {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10509,5 +10546,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10516,10 +10553,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10528,5 +10565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10817,11 +10854,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
@@ -10833,6 +10870,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>"
@@ -10848,8 +10885,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 ""
 
@@ -10951,6 +10988,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
@@ -10973,6 +11010,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 ""
 
@@ -11082,5 +11119,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11214,8 +11252,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 ""
 
@@ -11301,8 +11339,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í "
@@ -11333,7 +11371,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 ""
 
@@ -11404,34 +11442,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Pojmenované trasové body"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Zobrazit nebo skrýt menu Zvuk v menu hlavní nabídky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11439,5 +11473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11445,21 +11479,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Při importu zvuku udělat značky z..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Při importu zvuku použít záznam na značky v GPX vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11467,5 +11495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11473,5 +11501,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11479,17 +11507,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Skok dopředu/vzad (vteřiny)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Násobič rychlého přehrávání"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11497,13 +11525,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Kalibrace nahrávání zvuku"
@@ -11543,5 +11571,5 @@
 msgstr "Barvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11552,35 +11580,35 @@
 msgstr "Všechny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Místní soubory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Žádný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Vynutit kreslení spojnic mezi GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Kreslit větší GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -11588,5 +11616,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11608,5 +11636,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11648,5 +11676,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11660,50 +11688,60 @@
 msgstr "Pěší"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Kreslit šipky ve směru jízdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Rychlé vykreslování (vypadá ošklivě)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Jen zajímavé směry (např. jednosměrka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Pouze na prvním úseku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Vykreslit segmenty s pořadovými čísly"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykreslit ohraničující box stažených dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykreslovat virtuální uzly v modu výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhlazené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Kreslit čáru mezi body GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11711,9 +11749,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maximální délka lokálních souborů (v metrech)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11722,10 +11760,10 @@
 "kreslení všech linií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximální délka (metrů)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11733,15 +11771,16 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Zobrazovat šipky pro čary spojující GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11749,13 +11788,13 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimální vzdálenost (pixelů)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovat větší tečky pro GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11765,9 +11804,9 @@
 "v kartě vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Obarvovat body a části trasy podle rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11775,46 +11814,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Barvy tras a bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Zobrazovat směr u segmentů cesty."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zobrazovat pořadí u všech segmentů v cestách."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovat hranice dat stažených ze serveru."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM data"
@@ -11886,5 +11926,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11935,6 +11976,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Aktualizace pluginů"
@@ -12016,6 +12057,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 "
@@ -12032,9 +12073,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 ""
 
@@ -12331,6 +12372,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 ""
 
@@ -12458,6 +12499,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 ""
 
@@ -12479,6 +12520,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 ""
 
@@ -12564,5 +12605,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12580,5 +12622,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr "Již máte přístupový token pro přístup OSM serveru pomocí OAuth."
 
@@ -12608,5 +12651,6 @@
 #, 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
@@ -12673,6 +12717,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 "
@@ -12977,5 +13021,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
@@ -13160,5 +13204,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13553,6 +13598,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>"
@@ -13581,14 +13626,15 @@
 #, 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
@@ -13626,6 +13672,8 @@
 #: ../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
@@ -14070,14 +14118,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "nahrávám plugin ''{0}'' (verze {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14086,23 +14139,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Nahrávám pluginy ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Kontroluji požadavky pluginu..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Nahrávám plugin ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14111,5 +14159,5 @@
 msgstr[2] "JOSM nemůže nalézt informace o následujících pluginech:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14117,17 +14165,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14136,5 +14184,5 @@
 msgstr[2] "Aktualizace následujících pluginů selhala:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14146,42 +14194,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Zakázat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Ponechat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14190,5 +14238,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14197,22 +14245,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dle informací z pluginu je autor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14220,9 +14268,9 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Chcete plugin zakázat ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14232,14 +14280,14 @@
 "programu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "není zádný popis"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14281,5 +14329,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14341,5 +14390,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"
@@ -14422,17 +14471,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 ""
 
@@ -14440,7 +14489,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 ""
 
@@ -14448,8 +14497,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 ""
 
@@ -14469,7 +14518,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 ""
 
@@ -14548,6 +14597,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 "<html>OSM server<br>''{0}''<br>reportoval interní chybu serveru.<br>Jde s "
@@ -14561,7 +14611,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 ""
 
@@ -14596,9 +14646,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15269,7 +15319,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15279,5 +15329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15287,5 +15337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15301,5 +15351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15309,5 +15359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15338,5 +15388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15345,5 +15395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15352,5 +15402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15359,5 +15409,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15366,5 +15416,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15373,5 +15423,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15405,10 +15455,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15795,6 +15846,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
@@ -15901,34 +15952,35 @@
 msgstr "Chyba Lambertovy zóny v cache"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Použití"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Vyberte schéma k použití."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Schéma barev"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Vyberte schéma ke smazání."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Použít vybrané schéma ze seznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Použít současné bervy jako nové barevné schéma."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Smazat vybrané schéma ze seznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Schémata barev"
@@ -16003,5 +16055,5 @@
 msgstr "Vrstva pro editaci GPX tras"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertovat do GPX vrstvy s anonymizací času"
@@ -16092,4 +16144,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16302,5 +16355,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16421,6 +16474,8 @@
 
 #: ../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
@@ -16440,10 +16495,11 @@
 #: ../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 ""
-"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 "
+"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."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -16456,5 +16512,6 @@
 #: ../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
@@ -16760,5 +16817,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Hlavička obsahuje několik hodnot a nelze ji mapovat do jednoduchého řetězce"
@@ -16873,5 +16931,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16924,5 +16983,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17745,4 +17805,12 @@
 msgstr "Řada domů"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18071,6 +18139,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
@@ -18195,9 +18263,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
@@ -18284,8 +18352,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 ""
 
@@ -18339,8 +18407,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 ""
 
@@ -18455,6 +18523,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 ""
 
@@ -18462,6 +18530,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 ""
 
@@ -18585,5 +18653,6 @@
 "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
@@ -18760,5 +18829,6 @@
 #: ../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
@@ -18975,5 +19045,6 @@
 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:157
@@ -19105,6 +19176,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -19253,5 +19325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19296,5 +19368,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 "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
@@ -19351,5 +19424,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19734,9 +19807,6 @@
 msgstr "WMS soubory (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19747,10 +19817,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Databáze je mimo provoz kvůli údržbě"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19760,25 +19830,25 @@
 "Vyžádejte si menší plochu, nebo použijte planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr ""
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Audio zařízení je nedostupné"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Musíte vaše editace označit jako veřejné pro nahrávání nových dat"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19786,17 +19856,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "les"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19804,7 +19874,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19814,5 +19884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19855,5 +19925,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19863,5 +19933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19871,5 +19941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19879,8 +19949,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19894,5 +19964,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19903,5 +19973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19910,7 +19980,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19920,5 +19990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19928,5 +19998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19936,5 +20006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19944,5 +20014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19952,5 +20022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19960,5 +20030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19968,8 +20038,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19979,59 +20049,60 @@
 msgstr "cesta"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Volitelné atributy:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Modifikátory:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Jméno souboru"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Schůdky přes ohrazení"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Typ vedení"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Domovská stránka"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoistické"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Přiblížit"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nová role"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Vytvořit nový uzel."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Uložit"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20091,6 +20162,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
@@ -20110,5 +20181,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM."
 
@@ -20293,6 +20365,13 @@
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20303,5 +20382,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20312,10 +20391,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20326,5 +20405,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20334,5 +20413,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20343,15 +20422,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 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:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20360,5 +20439,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21249,7 +21328,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21389,8 +21468,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"/>
@@ -21600,5 +21679,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21608,5 +21687,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21625,5 +21704,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21633,5 +21712,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21650,5 +21729,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21658,5 +21737,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21675,5 +21754,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21683,5 +21762,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21696,5 +21775,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21712,5 +21791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21728,5 +21807,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21735,5 +21814,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21743,5 +21822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21761,5 +21840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21768,5 +21847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21776,5 +21855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22164,5 +22243,6 @@
 #: 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
@@ -22478,5 +22558,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22527,5 +22607,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22622,5 +22702,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22788,5 +22868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23120,5 +23200,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23128,5 +23208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23136,5 +23216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23144,5 +23224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23152,5 +23232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23160,5 +23240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23168,5 +23248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23177,5 +23257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24595,5 +24675,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24603,5 +24683,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24611,5 +24691,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24619,5 +24699,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24981,7 +25061,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24991,5 +25071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24999,5 +25079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25007,5 +25087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25015,5 +25095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25023,5 +25103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25031,5 +25111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25039,5 +25119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25047,5 +25127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25055,5 +25135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25063,5 +25143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25071,5 +25151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25079,5 +25159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25087,5 +25167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25095,5 +25175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25103,5 +25183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25111,5 +25191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25119,5 +25199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25127,5 +25207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25135,5 +25215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25143,5 +25223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25151,5 +25231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25159,5 +25239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25167,5 +25247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25175,5 +25255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25183,5 +25263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25191,5 +25271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25199,5 +25279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25207,5 +25287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25215,5 +25295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25223,5 +25303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25231,5 +25311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25239,5 +25319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25247,5 +25327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25255,5 +25335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25263,5 +25343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25271,5 +25351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25279,5 +25359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25287,5 +25367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25295,5 +25375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25303,5 +25383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25311,5 +25391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25319,5 +25399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25327,5 +25407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25335,5 +25415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25343,5 +25423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25351,5 +25431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27055,7 +27135,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27065,5 +27145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27073,5 +27153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27081,5 +27161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27089,5 +27169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27097,5 +27177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27105,5 +27185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27113,5 +27193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27121,5 +27201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28542,5 +28622,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28556,5 +28636,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28564,5 +28644,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28573,5 +28653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28584,7 +28664,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28594,5 +28674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28602,5 +28682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28610,5 +28690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28618,5 +28698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28650,5 +28730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28664,5 +28744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28672,5 +28752,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28679,5 +28759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28687,5 +28767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28696,5 +28776,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28719,5 +28799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28832,9 +28912,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 +28922,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 +28930,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 +28945,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28871,5 +28951,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28918,6 +28998,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 +29077,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29005,11 +29085,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29025,5 +29105,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29032,5 +29112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29039,5 +29119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29053,5 +29133,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29065,5 +29145,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29072,5 +29152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29079,5 +29159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29086,5 +29166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29093,5 +29173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29100,5 +29180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29107,5 +29187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29114,5 +29194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29121,5 +29201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29128,5 +29208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29135,5 +29215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29142,5 +29222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29149,5 +29229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29156,5 +29236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29163,5 +29243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29338,7 +29418,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29352,5 +29432,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29360,7 +29440,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29370,5 +29450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29378,5 +29458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29386,5 +29466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29394,5 +29474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29408,5 +29488,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29415,5 +29495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29423,5 +29503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29430,5 +29510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29437,5 +29517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29444,5 +29524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29451,5 +29531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29458,5 +29538,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29465,5 +29545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29472,5 +29552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29479,5 +29559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29486,5 +29566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29498,5 +29578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29510,5 +29590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29517,5 +29597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29529,5 +29609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29542,5 +29622,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29555,5 +29635,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29567,5 +29647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29579,5 +29659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29586,5 +29666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29593,5 +29673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29601,5 +29681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29608,5 +29688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29615,5 +29695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29622,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29630,5 +29710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29639,5 +29719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29647,7 +29727,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29657,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29665,5 +29745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29673,5 +29753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29682,5 +29762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29689,5 +29769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29697,5 +29777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29705,5 +29785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29713,5 +29793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29721,5 +29801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29729,5 +29809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29737,5 +29817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29745,5 +29825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29753,5 +29833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29761,5 +29841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29782,5 +29862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29795,7 +29875,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29805,5 +29885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29812,5 +29892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29820,5 +29900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29827,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29835,5 +29915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29843,5 +29923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29857,5 +29937,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29866,5 +29946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29883,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29891,5 +29971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29902,5 +29982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29919,5 +29999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29926,5 +30006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29933,5 +30013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29940,7 +30020,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29951,5 +30031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29964,5 +30044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29976,5 +30056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29984,5 +30064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29996,5 +30076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30008,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30015,5 +30095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30022,7 +30102,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30032,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30040,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30048,5 +30128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30056,5 +30136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30064,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30078,7 +30158,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30093,5 +30173,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30106,5 +30186,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30119,5 +30199,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30132,5 +30212,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30145,5 +30225,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30158,7 +30238,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30168,5 +30248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30175,5 +30255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30183,5 +30263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30191,5 +30271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30199,5 +30279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30207,5 +30287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30215,5 +30295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30223,5 +30303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30231,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30239,5 +30319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30247,5 +30327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30255,5 +30335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30263,5 +30343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30281,5 +30361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30294,5 +30374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30305,7 +30385,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30315,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30323,5 +30403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30331,5 +30411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30339,5 +30419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30347,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30355,5 +30435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30363,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30371,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30379,5 +30459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30387,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30395,5 +30475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30403,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30411,5 +30491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30419,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30427,5 +30507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30435,5 +30515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30455,5 +30535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30467,7 +30547,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30477,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30485,5 +30565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30493,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30501,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30509,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30517,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30525,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30533,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30541,5 +30621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30549,5 +30629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30566,5 +30646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30574,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30582,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30590,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30598,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30606,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30614,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30622,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30630,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30638,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30646,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30654,5 +30734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30671,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30678,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30686,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30693,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30701,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30709,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30717,5 +30797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30724,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30732,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30740,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30748,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30756,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30763,5 +30843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30770,5 +30850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30777,5 +30857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30784,5 +30864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30791,5 +30871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30798,5 +30878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30805,5 +30885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30812,5 +30892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30819,5 +30899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30826,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30833,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30840,5 +30920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30847,5 +30927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30855,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30863,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30871,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30879,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30887,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30895,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30903,5 +30983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30911,5 +30991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30919,5 +30999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30928,5 +31008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30936,5 +31016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30944,5 +31024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30952,5 +31032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30960,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30968,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30976,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30984,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30992,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31000,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31008,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31016,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31024,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31032,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31040,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31048,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31056,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31064,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31072,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31080,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31087,5 +31167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31117,5 +31197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31125,5 +31205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31133,7 +31213,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31148,5 +31228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31156,5 +31236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31164,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31172,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31180,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31188,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31196,5 +31276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31210,7 +31290,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31220,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31228,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31236,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31244,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31252,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31260,5 +31340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31268,5 +31348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31276,5 +31356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31284,5 +31364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31292,5 +31372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31300,5 +31380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31308,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31316,5 +31396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31324,5 +31404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31332,5 +31412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31340,5 +31420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31348,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31356,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31364,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31372,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31380,5 +31460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31388,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31396,5 +31476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31404,5 +31484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31412,5 +31492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31420,5 +31500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31428,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31436,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31444,5 +31524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31452,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31460,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31468,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31476,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31484,5 +31564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31492,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31500,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31508,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31516,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31524,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31532,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31540,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31548,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31582,7 +31662,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31592,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31600,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31608,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31616,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31624,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31632,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31640,5 +31720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31655,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31663,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31671,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31679,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31687,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31695,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31704,5 +31784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31712,5 +31792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31720,5 +31800,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31728,5 +31808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31735,5 +31815,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31742,5 +31822,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31758,7 +31838,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31768,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31776,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31784,5 +31864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31792,5 +31872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31800,5 +31880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31808,5 +31888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31816,5 +31896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31824,5 +31904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31832,5 +31912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31848,5 +31928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31860,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31872,5 +31952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31880,5 +31960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31892,5 +31972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31904,6 +31984,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31913,5 +31993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31925,5 +32005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31937,5 +32017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31949,5 +32029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31961,5 +32041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31973,5 +32053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31981,7 +32061,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31991,5 +32071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31999,5 +32079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32007,5 +32087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32015,5 +32095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32030,5 +32110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32041,5 +32121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32053,5 +32133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32065,5 +32145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32077,5 +32157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32086,5 +32166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32094,5 +32174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32102,5 +32182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32110,5 +32190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32118,5 +32198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32133,5 +32213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32145,5 +32225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32157,5 +32237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32169,5 +32249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32181,5 +32261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32194,5 +32274,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 +32298,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32227,11 +32307,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32241,5 +32321,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32249,5 +32329,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32257,5 +32337,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32265,5 +32345,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32273,5 +32353,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32281,5 +32361,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32289,5 +32369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32297,5 +32377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32305,5 +32385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32313,5 +32393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32321,5 +32401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32329,5 +32409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32347,5 +32427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32440,5 +32520,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 +32526,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 +32662,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32593,5 +32673,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 +32696,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32624,6 +32704,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32638,6 +32718,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 +32731,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 +32750,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32693,6 +32773,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
@@ -32780,10 +32860,13 @@
 #~ 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}"
@@ -32798,7 +32881,9 @@
 #~ 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"
@@ -32810,4 +32895,5 @@
 #~ 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}"
@@ -32825,4 +32911,5 @@
 #~ 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}"
@@ -32831,7 +32918,9 @@
 #~ 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}"
@@ -32844,6 +32933,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 "
@@ -32866,6 +32955,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?"
 
@@ -32918,4 +33007,5 @@
 #~ msgstr "Nahrát výběr"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -32933,6 +33023,5 @@
 #~ "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."
@@ -32958,13 +33047,12 @@
 
 #~ 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."
@@ -32974,12 +33062,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 ""
 #~ "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?"
+
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33013,6 +33102,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..."
@@ -33022,7 +33111,9 @@
 #~ 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}."
@@ -33034,4 +33125,5 @@
 #~ msgstr "Stáhnout chybějící pluginy"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33046,4 +33138,5 @@
 #~ msgstr "Aktualizuj pluginy"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Nemohu stáhnout plugin: {0} z {1}"
@@ -33058,4 +33151,5 @@
 #~ msgstr "Upravit vlastnosti"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -33083,9 +33177,8 @@
 
 #~ 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."
@@ -33095,16 +33188,19 @@
 #~ 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"
@@ -33127,7 +33223,8 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému "
-#~ "vývojáře JOSM."
-
+#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému vývojáře "
+#~ "JOSM."
+
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Prosíme oznamte chybu na {0}"
@@ -33139,10 +33236,13 @@
 #~ 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 "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."
@@ -33151,4 +33251,5 @@
 #~ msgstr "Povoleny pouze dva uzly"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Nelze otevřít adresář s nastavením: {0}"
@@ -33185,7 +33286,9 @@
 #~ 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}\""
@@ -33200,13 +33303,17 @@
 #~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly."
 
+#, 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}"
@@ -33224,9 +33331,8 @@
 #~ msgstr "Vyberte řádek ke zkopírování."
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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?"
@@ -33242,7 +33348,9 @@
 #~ 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."
@@ -33273,6 +33381,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 ?"
@@ -33290,9 +33398,8 @@
 #~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
-#~ "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 ""
@@ -33310,6 +33417,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)"
@@ -33340,4 +33447,5 @@
 #~ 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"
@@ -33394,4 +33502,5 @@
 #~ msgstr "Posunout nahoru"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relací: {0}"
@@ -33404,4 +33513,5 @@
 #~ "server mají historii."
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33413,4 +33523,5 @@
 #~ msgstr "Aktualizovat data"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Nejprve změňte projekci na {0}."
@@ -33425,4 +33536,5 @@
 #~ 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"
@@ -33437,7 +33549,9 @@
 #~ msgstr "Následující chyby nastaly při hromadném stahování:"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Chyby při stahování"
+
 #~ 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 ""
@@ -33479,6 +33593,5 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
 #~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
@@ -33488,4 +33601,5 @@
 #~ 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}''."
@@ -33522,6 +33636,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."
@@ -33532,6 +33646,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ří "
@@ -33539,6 +33653,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í "
@@ -33550,6 +33664,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 "
@@ -33563,4 +33677,5 @@
 #~ "'pluginmanager.warntime'.)"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33578,10 +33693,11 @@
 
 #~ 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}"
@@ -33590,4 +33706,5 @@
 #~ 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"
@@ -33619,4 +33736,5 @@
 #~ "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ý."
@@ -33646,7 +33764,9 @@
 #~ 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 "
@@ -33659,4 +33779,5 @@
 #~ 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 "
@@ -33666,10 +33787,11 @@
 #~ "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"
@@ -33700,4 +33822,5 @@
 #~ 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>"
@@ -33715,7 +33838,9 @@
 #~ 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}."
@@ -33725,6 +33850,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 "
@@ -33740,6 +33865,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"
@@ -33748,6 +33873,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 "
@@ -33763,18 +33888,20 @@
 #~ "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 "
@@ -33782,21 +33909,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>"
-
+#~ "<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
 #~ 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 ">"
@@ -33806,13 +33933,15 @@
 #~ 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 "
@@ -33822,4 +33951,5 @@
 #~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -33833,14 +33963,16 @@
 #~ 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>"
@@ -33850,4 +33982,5 @@
 #~ msgstr "Spojený"
 
+#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
@@ -33865,10 +33998,13 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
+#, 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 "
@@ -33878,4 +34014,5 @@
 #~ "vkládání dalších dat"
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -33883,8 +34020,6 @@
 #~ "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"
@@ -33903,7 +34038,9 @@
 #~ 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 "
@@ -33912,7 +34049,8 @@
 #~ "<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 "
@@ -33931,13 +34069,15 @@
 #~ 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"
@@ -33949,10 +34089,11 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
-#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
-
+#~ "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
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -33962,18 +34103,23 @@
 #~ "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}''."
-
+#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti je: "
+#~ "''{0}''."
+
+#, java-format
 #~ 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}"
@@ -33985,4 +34131,5 @@
 #~ 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}"
@@ -33994,13 +34141,17 @@
 #~ 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ý"
@@ -34009,13 +34160,17 @@
 #~ 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}''."
@@ -34023,34 +34178,39 @@
 #~ "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}''"
-
+#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno ''{1}''"
+
+#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parametr ''{0}'' nesmí být null"
 
+#, 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"
+#~ msgstr "Aplikovat také na potomky"
 
 #~ msgid "Failed to launch the external help browser"
@@ -34060,4 +34220,5 @@
 #~ 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}"
@@ -34075,33 +34236,37 @@
 #~ 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 ""
@@ -34110,8 +34275,9 @@
 #~ "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."
@@ -34120,4 +34286,5 @@
 #~ msgstr[2] "{0} pluginů staženo úspěšně."
 
+#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -34127,4 +34294,5 @@
 #~ 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}"
@@ -34158,6 +34326,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 21602)
+++ /applications/editors/josm/i18n/po/da.po	(revision 21603)
@@ -9,7 +9,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:49+0000\n"
-"Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 13:01+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +263,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -317,9 +317,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
@@ -342,9 +342,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
@@ -435,6 +435,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -649,12 +649,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1330,7 +1330,7 @@
 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
@@ -1456,5 +1456,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1475,5 +1476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1625,6 +1626,8 @@
 
 #: ../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
@@ -1645,5 +1648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1783,6 +1786,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
@@ -1851,5 +1854,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Et punkt, som bruges af mere end én vej og en af disse veje, eller"
 
@@ -1922,9 +1926,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)"
@@ -1941,5 +1945,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -1975,5 +1979,6 @@
 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
@@ -2233,6 +2238,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "Fejl under download"
 
@@ -2267,7 +2272,7 @@
 msgstr "({0}/{1}) Henter forældre til relation {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Fejl under download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2401,6 +2406,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 "
@@ -2529,69 +2534,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Søg..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Søg efter objekter."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Indtast venligst en filter tekst"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Indtast en søgetekst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Indtast søgeudtrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "erstat markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "føj til markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "fjern fra markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "Find i markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regulært udtryk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - ''Baker'' og ''Street'' i enhver nøgle eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' i enhver nøgle eller navn."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgstr ""
+"<b>\"Baker Street\"</b> - ''Baker Street'' i enhver nøgle eller navn."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' hvor som helst i navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=rute</b> - nøgle ''type'' med værdi = præcist ''rute''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2601,39 +2607,39 @@
 "<b>*=værdi</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - intet ''Bak'' i navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>fod:</b> - key=fod sat til hvilkensomhelst værdi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Specielle mål:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b> - objektets type (<b>punkt</b>, <b>vej</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+"<b>type:</b> - objektets type (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - alle objekter rettet af bruger"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>bruger:anonym</b> - alle objekter ændret af anonyme brugere"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt med givet ID (0 for nye objekter)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2643,5 +2649,5 @@
 "version)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2651,13 +2657,13 @@
 "rettesæt)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
 msgstr ""
 "<b>punkter:</b>... - objekt med givet antal punkter (punkter:tæl eller "
 "punkter:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2666,5 +2672,9 @@
 "<b>tags:</b>... - objekt med givet antal tags (tags:tæl or tags:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2674,21 +2684,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> eller <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle ændrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle valgte objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle ufuldstændige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>utagget</b> - alle utaggede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2696,5 +2706,5 @@
 "<b>barn <i>udtryk</i></b> - alle børn af objekter der matcher udtrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2703,16 +2713,16 @@
 "udtrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 "Brug <b>|</b> eller <b>OR</b> to for at forbinde med et logisk \"eller\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
-"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
+"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:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2722,11 +2732,11 @@
 "<b>\\</b> (f.eks. <b>\\\"</b> og <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Brug <b>(</b> og <b>)</b> for at gruppere udtryk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2734,38 +2744,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Søg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Send filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start søgning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Intet resultat for \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Intet føjet til markering ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Intet fjernet fra markering ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Intet fundet i markering ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2773,5 +2783,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2779,5 +2789,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2785,5 +2795,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2802,51 +2812,55 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr "Nø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:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Mønster-syntaks-fejl: Mønster {0} i {1} er ulovlig!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+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
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
-"Ukendt primitiv type: {0}. Tilladte værdier er punkt, vej eller relation"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+"Ukendt primitiv type: {0}. Tilladte værdier er node, way eller relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Manglende parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Manglende operatør for NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2893,7 +2907,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
@@ -2917,5 +2931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3129,7 +3143,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 "
@@ -3411,9 +3425,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
@@ -3488,5 +3502,6 @@
 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
@@ -3501,5 +3516,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3508,5 +3523,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3515,5 +3530,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3552,5 +3567,5 @@
 "allerede er inkluderet"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3609,5 +3624,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3615,5 +3630,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3621,17 +3636,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Tekst"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3639,5 +3648,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3646,5 +3655,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3652,5 +3661,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3658,5 +3667,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3664,42 +3673,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "En primitiv med ID = 0 kan ikke være usynlig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 forventet. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 forventet. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3710,5 +3719,5 @@
 "er {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3716,5 +3725,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3774,5 +3783,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "Kan ikke sammenligne primitiv med ID \"{0}\" med primitiv med ID \"{1}\"."
@@ -3783,81 +3793,81 @@
 msgstr "Parameter {0} ikke i interval 0..{1}. Fik ''{2}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Vej omkring område er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Mere end én \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Mere end én \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Mere end én \"via\" blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukendt rolle \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukendt medlemstype for \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Ingen \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Ingen \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Intet \"via\"-punkt eller vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil for restriktion {0} ikke fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre vej \"{0}\" er lig med multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil for ydre vej \"{0}\" passer ikke sammen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Fejl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4033,6 +4043,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>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
@@ -4102,5 +4114,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4110,5 +4122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4117,5 +4129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4124,5 +4136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4131,5 +4143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4138,5 +4150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4145,9 +4157,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4462,5 +4474,6 @@
 #, 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:168
@@ -4469,6 +4482,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4483,4 +4496,5 @@
 msgstr "Redigér"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4642,6 +4656,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
@@ -4682,5 +4696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4719,6 +4733,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 ""
 
@@ -4749,5 +4763,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"
@@ -4756,5 +4770,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"
@@ -4763,5 +4777,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,5 +5005,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopiér deres markerede elementer til enden af listen over sammenlagte "
@@ -5020,6 +5035,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5031,5 +5047,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Ned"
@@ -5074,6 +5090,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 "
@@ -5083,6 +5099,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 "
@@ -5138,6 +5154,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>"
@@ -5360,6 +5376,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5372,6 +5388,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5622,6 +5638,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
@@ -5636,9 +5652,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
@@ -5653,6 +5669,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>"
@@ -5673,6 +5689,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
@@ -5690,11 +5706,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
@@ -5718,5 +5734,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr "Download information om de markerede rettesæt fra OSM serveren"
 
@@ -5734,6 +5751,5 @@
 msgstr "Åbn en webside for hvert markeret rettesæt"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5757,5 +5773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5763,5 +5779,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5838,9 +5854,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5858,13 +5875,13 @@
 msgstr "Løs konflikter for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrér objekter og skjul/slå dem fra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5873,45 +5890,41 @@
 msgstr "Tilføj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "tilføj filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Redigér filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Slet filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Flyt filter op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Flyt filter ned."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Slå filter til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Skjul elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Anvend også for børn"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Omvend filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Filtertilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6139,10 +6152,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Markér i relationsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Markér relation i relationsliste."
@@ -6494,4 +6507,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7388,5 +7402,6 @@
 "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
@@ -7625,9 +7640,10 @@
 #, 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
@@ -7637,6 +7653,7 @@
 "{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
@@ -7652,8 +7669,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 ""
 
@@ -7778,5 +7795,5 @@
 msgstr "Denne rettesætsforespørgselsURL er ugyldig"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7785,23 +7802,23 @@
 msgstr[1] "Dette vil ændre op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "En tom værdi sletter taggen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Ret værdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7810,5 +7827,5 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7817,77 +7834,81 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Vælg de objekter, du vil rette egenskaber for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Egenskaber/medlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Egenskaber for valgte objekter."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Medlem af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det markerede fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Markér relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Vælg relation i hovedmarkering."
@@ -8004,10 +8025,11 @@
 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
@@ -8024,6 +8046,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 "
@@ -8198,6 +8220,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 "<html>Lag ''{0}'' har allerede en konflikt for primitiv<br>''{1}''.<br>Løs "
@@ -8541,10 +8564,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>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
@@ -8603,4 +8627,5 @@
 msgstr "Forespørger på navneserver ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8683,6 +8708,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 ""
 
@@ -8692,6 +8717,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 ""
 
@@ -8811,5 +8836,6 @@
 #: ../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
@@ -8976,8 +9002,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Upload <strong>fejlede</strong> fordi serveren har en nyere version af "
@@ -8986,6 +9013,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
@@ -8999,12 +9026,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9261,5 +9290,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Start en filvælger for at markere en fil"
@@ -9276,5 +9305,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr "Lag \"{0}\" har ændringer som bør uploades til serveren."
 
@@ -9364,6 +9394,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 "
@@ -9381,6 +9411,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 "
@@ -9606,5 +9636,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9634,5 +9664,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr "Rettesættet vil blive <strong>lukket</strong> efter denne upload"
 
@@ -9699,6 +9730,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> "
@@ -9754,7 +9785,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 ""
 
@@ -9764,5 +9795,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9789,5 +9820,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Ignorerer fanget undtagelse fordi upload blev annulleret. Undtagelse er: {0}"
@@ -9820,5 +9852,6 @@
 #, 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
@@ -10018,11 +10051,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
@@ -10047,11 +10080,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:373
@@ -10114,6 +10147,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Upload af ubehandlede GPS-data som kortdata betragtes som skadeligt "
@@ -10129,5 +10162,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10306,6 +10339,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 "
@@ -10367,7 +10400,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 "
@@ -10438,64 +10471,68 @@
 msgstr "Automatisk gæt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Manuel justering"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Underkend position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Billeder med geo-lokation i exif-data ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Billeder der allerede er taggede ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Vis miniaturebilleder på kortet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Tidszone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Forskydning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Afstem billeder med GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Sammenhold"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ugyldig tidszone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ugyldig forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Prøv igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Ingen billeder kunne afstemmes!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Ingen gpx valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10505,20 +10542,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10527,5 +10564,5 @@
 msgstr[1] "Tidsforskel for {0} dage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10535,39 +10572,40 @@
 "kan justere gliderne for manuelt at afstemme fotoene."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Det lykkedes ikke at matche fotos med spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Justér tidszone og forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Det valgte billede rummer ingen tidsangivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Billederne rummer ingen tidsangivelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+msgstr ""
+"Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX-sporet har ingen tidsangivelser."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Du bør vælge et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Intet valgt GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10578,5 +10616,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10629,14 +10667,14 @@
 msgstr "Fejl ved hentning af filer fra mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10645,5 +10683,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10652,10 +10690,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Slet billedfil fra disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10663,8 +10701,8 @@
 "permanently lost!</h3></html>"
 msgstr ""
-"<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:664
+"<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
 msgid "Image file could not be deleted."
 msgstr "Billedfilen kunne ikke slettes"
@@ -10811,5 +10849,6 @@
 "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,6 +10937,7 @@
 "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
@@ -10928,5 +10968,6 @@
 #: ../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
@@ -10939,6 +10980,7 @@
 "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
@@ -10962,6 +11004,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-"
@@ -10993,8 +11035,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 ""
 
@@ -11115,6 +11157,7 @@
 "<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
@@ -11122,11 +11165,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
@@ -11242,5 +11285,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 "Kunne ikke autentikere bruger ''{0}'' med adgangskode ''***'' som OAuth-"
@@ -11318,5 +11362,6 @@
 #: ../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
@@ -11378,8 +11423,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 ""
 
@@ -11462,8 +11507,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 ""
 
@@ -11494,7 +11539,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 "
@@ -11569,27 +11614,22 @@
 msgstr "Vis live lydspor."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-"Opret markører der ikke har noget med lyd at gøre, når der læses GPX-data."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Tydelige vejpunkter med gyldige tidsstempler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Tydelige vejpunkter med tid anslået udfra sporposition"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Navngivne sporpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Ændrede tider (tidsstempler) af lydfiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -11597,9 +11637,9 @@
 "tilgængelige)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Vis eller skjul lydmenu-punktet i hovedmenu-baren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11609,5 +11649,5 @@
 "hvor lyden der spiller nu var indspillet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11617,22 +11657,15 @@
 "ikoner."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Lav automatisk et markørlag udfra ethvert vejpunkt ved åbning af et GPX-lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Når lyd importeres, opret markører ud fra..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Når lyd importeres, tilknyt den til ethvert vejpunkt i GPX-laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11642,5 +11675,5 @@
 "waypoints) med navne eller beskrivelser."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11650,5 +11683,5 @@
 "af hver lyd-WAV-fil importeret."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11658,17 +11691,17 @@
 "trykkes ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Frem/tilbage tid (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Hvor mange gange hurtigere farten er ved \"hurtig frem\""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Hurtig frem multiplikator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11678,13 +11711,13 @@
 "forespurgte lydsporsposition"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Tid for indføring (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "Forløbet tid af lydoptagelse i forhold til sand forløbet tid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Kalibrering af lydoptagelse"
@@ -11724,5 +11757,5 @@
 msgstr "Farver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11733,34 +11766,34 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Fremtving linjer, hvis ingen segmenter blev importeret."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Tegn en cirkel udfra HDOP-værdi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighed (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -11768,5 +11801,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11788,5 +11821,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11828,5 +11861,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11840,50 +11873,61 @@
 msgstr "Gående"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspile."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig optegning (ser grimmere ud)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Kun ved enden af vejen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Tegn numre for segment-rækkefølgen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn grænserne for downloadet data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle punkter i valg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i anden farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Udglattet kortgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Lav automatisk et markørlag udfra ethvert vejpunkt ved åbning af et GPX-lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellem rå GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11893,9 +11937,9 @@
 "for at tegne alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maksimal længde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11904,10 +11948,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maksimal længde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11916,30 +11960,32 @@
 "information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Tegn retningspile ved hjælp af tabelopslag i stedet for kompleks matematik."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+msgstr ""
+"Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Mindste afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11948,9 +11994,9 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i laghåndtering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Farvelægger punkter og spor efter hastighed."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11958,37 +12004,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr "Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+msgstr ""
+"Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningsvisere på vejstykker"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn ordensnumrene på alle segmenter i deres vej."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omridset af data hentet fra serveren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11996,9 +12044,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en anden farve."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12070,5 +12118,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12117,6 +12166,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Opdatér udvidelser"
@@ -12193,6 +12242,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 ""
 
@@ -12205,9 +12254,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 ""
 
@@ -12508,9 +12557,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:766
@@ -12635,9 +12684,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>"
-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
@@ -12658,10 +12708,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
@@ -12672,7 +12722,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
@@ -12730,10 +12780,11 @@
 "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
@@ -12750,5 +12801,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12764,5 +12816,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12858,9 +12911,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
@@ -13167,5 +13220,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
@@ -13354,5 +13407,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13456,5 +13510,6 @@
 #: ../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
@@ -13482,5 +13537,6 @@
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
-msgstr "Uventet format af ny version af ændret primitiv \"{0}\". Fik  \"{1}\"."
+msgstr ""
+"Uventet format af ny version af ændret primitiv \"{0}\". Fik  \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
@@ -13624,6 +13680,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
@@ -13672,6 +13728,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
@@ -13758,6 +13814,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 ""
 
@@ -13785,9 +13841,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
@@ -13828,5 +13884,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr "Ulovlig værdi af attribut ''ref'' på medlem i relation {0}. Fik {1}"
 
@@ -14263,14 +14320,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14279,23 +14341,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14303,5 +14360,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14309,17 +14366,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14327,5 +14384,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14337,42 +14394,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Slå udvidelse fra."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Behold udvidelse"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14381,5 +14438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14388,10 +14445,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14399,10 +14456,10 @@
 msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Ifølge udvidelsen medfølgende information, så er {0} forfatteren."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14411,9 +14468,9 @@
 "fejlrapport."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Skal udvidelsen slås fra?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14423,14 +14480,14 @@
 "udvidelsen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Information om udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "Ingen beskrivelse er tilgængelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14471,5 +14528,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14531,5 +14589,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"
@@ -14614,6 +14672,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 "
@@ -14623,7 +14681,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 ""
 
@@ -14631,7 +14689,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 ""
 
@@ -14639,8 +14697,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 ""
 
@@ -14660,7 +14718,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 ""
 
@@ -14725,7 +14783,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
@@ -14739,6 +14797,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14750,7 +14809,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 "
@@ -14792,13 +14851,13 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<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:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15473,7 +15532,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15483,5 +15542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15491,5 +15550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15505,5 +15564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15513,5 +15572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15542,5 +15601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15549,5 +15608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15556,5 +15615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15563,5 +15622,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15570,5 +15629,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15577,5 +15636,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15609,10 +15668,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -16097,34 +16157,35 @@
 msgstr "Mellemlager Lambert Zone fejl"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Brug"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Vælg venligst et skema, du vil benytte"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Farveskema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Vælg venligst det skema, du vil slette"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Brug det valgte skema fra listen"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Brug de nuværende farver i et nyt farveskema."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Slet det valgte skema fra listen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Farveskemaer"
@@ -16200,5 +16261,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16289,4 +16350,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16496,5 +16558,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16615,5 +16677,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antal segmenter tillladt for hver genereret vej. Standard er 250."
@@ -16635,6 +16698,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16918,7 +16982,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
@@ -16945,5 +17009,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -17055,5 +17120,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -17106,5 +17172,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17396,5 +17463,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr "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
@@ -17927,4 +17995,12 @@
 msgstr "Rækkehus"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18369,6 +18445,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 ""
 
@@ -18454,8 +18530,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 ""
 
@@ -18509,8 +18585,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 ""
 
@@ -18622,6 +18698,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 ""
 
@@ -18629,6 +18705,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 ""
 
@@ -19282,9 +19358,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"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:744
@@ -19431,5 +19509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19475,5 +19553,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 "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
@@ -19532,5 +19611,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19769,5 +19848,6 @@
 #, 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}\""
+msgstr ""
+"Advarsel: WMS-lag deaktiveret på grund af misformet basal URL \"{0}\""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
@@ -19929,9 +20009,6 @@
 msgstr "WMS Filer (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19942,10 +20019,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Databasen er utilgængelig på grund af vedligeholdelse"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19955,26 +20032,26 @@
 "enten et mindre område eller brug planet.osm."
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "kunne ikke hente lydkilde fra URL'en"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Lydenheden er utilgængelig"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 "Du skal gøre dine redigeringer offentlige for at kunne uploade nye data"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19982,17 +20059,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "skov"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20000,7 +20077,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20010,5 +20087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20051,5 +20128,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20059,5 +20136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20067,5 +20144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20075,8 +20152,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20090,5 +20167,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20099,5 +20176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20106,7 +20183,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20116,5 +20193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20124,5 +20201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20132,5 +20209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20140,5 +20217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20148,5 +20225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20156,5 +20233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20164,8 +20241,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20175,59 +20252,60 @@
 msgstr "rute"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Valgfri attributter:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "ingen tilføjelse"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Filnavn"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Stente"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Linie type"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Hjemmeside"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoistisk"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Zoom ind"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Ny rolle"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Opret nyt punkt."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Gem"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20307,5 +20385,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Download GPS-punkter direkte ind i JOSM fra Globalsat dg100-datalogger."
@@ -20470,5 +20549,6 @@
 #: build/trans_plugins.java:71
 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
@@ -20493,6 +20573,13 @@
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20501,5 +20588,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20508,10 +20595,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20522,5 +20609,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20530,5 +20617,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20539,15 +20626,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 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:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20556,8 +20643,9 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr "Vis georefererede billeder i JOSMs baggrund (WMS-servere, Yahoo, ...)."
+msgstr ""
+"Vis georefererede billeder i JOSMs baggrund (WMS-servere, Yahoo, ...)."
 
 #. <!--
@@ -21444,7 +21532,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21584,8 +21672,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"/>
@@ -21795,5 +21883,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21803,5 +21891,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21820,5 +21908,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21828,5 +21916,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21845,5 +21933,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21853,5 +21941,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21870,5 +21958,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21878,5 +21966,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21891,5 +21979,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21907,5 +21995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21923,5 +22011,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21930,5 +22018,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21938,5 +22026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21956,5 +22044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21963,5 +22051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21971,5 +22059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22673,5 +22761,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22722,5 +22810,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22817,5 +22905,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22983,5 +23071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23315,5 +23403,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23323,5 +23411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23331,5 +23419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23339,5 +23427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23347,5 +23435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23355,5 +23443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23363,5 +23451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23372,5 +23460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24790,5 +24878,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24798,5 +24886,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24806,5 +24894,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24814,5 +24902,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25176,7 +25264,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25186,5 +25274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25194,5 +25282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25202,5 +25290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25210,5 +25298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25218,5 +25306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25226,5 +25314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25234,5 +25322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25242,5 +25330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25250,5 +25338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25258,5 +25346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25266,5 +25354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25274,5 +25362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25282,5 +25370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25290,5 +25378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25298,5 +25386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25306,5 +25394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25314,5 +25402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25322,5 +25410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25330,5 +25418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25338,5 +25426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25346,5 +25434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25354,5 +25442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25362,5 +25450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25370,5 +25458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25378,5 +25466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25386,5 +25474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25394,5 +25482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25402,5 +25490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25410,5 +25498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25418,5 +25506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25426,5 +25514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25434,5 +25522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25442,5 +25530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25450,5 +25538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25458,5 +25546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25466,5 +25554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25474,5 +25562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25482,5 +25570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25490,5 +25578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25498,5 +25586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25506,5 +25594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25514,5 +25602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25522,5 +25610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25530,5 +25618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25538,5 +25626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25546,5 +25634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27250,7 +27338,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27260,5 +27348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27268,5 +27356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27276,5 +27364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27284,5 +27372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27292,5 +27380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27300,5 +27388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27308,5 +27396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27316,5 +27404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28737,5 +28825,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28751,5 +28839,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28759,5 +28847,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28768,5 +28856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28779,7 +28867,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28789,5 +28877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28797,5 +28885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28805,5 +28893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28813,5 +28901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28845,5 +28933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28859,5 +28947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28867,5 +28955,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28874,5 +28962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28882,5 +28970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28891,5 +28979,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28914,5 +29002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29027,9 +29115,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
@@ -29037,5 +29125,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,
@@ -29045,8 +29133,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
@@ -29060,5 +29148,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29066,5 +29154,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29113,6 +29201,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>
@@ -29192,5 +29280,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29200,11 +29288,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29220,5 +29308,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29227,5 +29315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29234,5 +29322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29248,5 +29336,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29260,5 +29348,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29267,5 +29355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29274,5 +29362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29281,5 +29369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29288,5 +29376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29295,5 +29383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29302,5 +29390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29309,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29316,5 +29404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29323,5 +29411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29330,5 +29418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29337,5 +29425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29344,5 +29432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29351,5 +29439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29358,5 +29446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29533,7 +29621,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29547,5 +29635,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29555,7 +29643,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29565,5 +29653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29573,5 +29661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29581,5 +29669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29589,5 +29677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29603,5 +29691,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29610,5 +29698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29618,5 +29706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29625,5 +29713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29632,5 +29720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29639,5 +29727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29646,5 +29734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29653,5 +29741,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29660,5 +29748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29667,5 +29755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29674,5 +29762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29681,5 +29769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29693,5 +29781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29705,5 +29793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29712,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29724,5 +29812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29737,5 +29825,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29750,5 +29838,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29762,5 +29850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29774,5 +29862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29781,5 +29869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29788,5 +29876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29796,5 +29884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29803,5 +29891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29810,5 +29898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29817,5 +29905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29825,5 +29913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29834,5 +29922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29842,7 +29930,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29852,5 +29940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29860,5 +29948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29868,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29877,5 +29965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29884,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29892,5 +29980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29900,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29908,5 +29996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29916,5 +30004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29924,5 +30012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29932,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29940,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29948,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29956,5 +30044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29977,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29990,7 +30078,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30000,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30007,5 +30095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30015,5 +30103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30022,5 +30110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30030,5 +30118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30038,5 +30126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30052,5 +30140,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30061,5 +30149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30078,5 +30166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30086,5 +30174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30097,5 +30185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30114,5 +30202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30121,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30128,5 +30216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30135,7 +30223,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30146,5 +30234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30159,5 +30247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30171,5 +30259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30179,5 +30267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30191,5 +30279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30203,5 +30291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30210,5 +30298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30217,7 +30305,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30227,5 +30315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30235,5 +30323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30243,5 +30331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30251,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30259,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30273,7 +30361,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30288,5 +30376,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30301,5 +30389,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30314,5 +30402,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30327,5 +30415,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30340,5 +30428,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30353,7 +30441,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30363,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30370,5 +30458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30378,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30386,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30394,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30402,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30410,5 +30498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30418,5 +30506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30426,5 +30514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30434,5 +30522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30442,5 +30530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30450,5 +30538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30458,5 +30546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30476,5 +30564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30489,5 +30577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30500,7 +30588,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30510,5 +30598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30518,5 +30606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30526,5 +30614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30534,5 +30622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30542,5 +30630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30550,5 +30638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30558,5 +30646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30566,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30574,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30582,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30590,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30598,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30606,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30614,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30622,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30630,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30650,5 +30738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30662,7 +30750,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30672,5 +30760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30680,5 +30768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30688,5 +30776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30696,5 +30784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30704,5 +30792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30712,5 +30800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30720,5 +30808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30728,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30736,5 +30824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30744,5 +30832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30761,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30769,5 +30857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30777,5 +30865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30785,5 +30873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30793,5 +30881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30801,5 +30889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30809,5 +30897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30817,5 +30905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30825,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30833,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30841,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30849,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30866,5 +30954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30873,5 +30961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30881,5 +30969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30888,5 +30976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30896,5 +30984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30904,5 +30992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30912,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30919,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30927,5 +31015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30935,5 +31023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30943,5 +31031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30951,5 +31039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30958,5 +31046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30965,5 +31053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30972,5 +31060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30979,5 +31067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30986,5 +31074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30993,5 +31081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31000,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31007,5 +31095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31014,5 +31102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31021,5 +31109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31028,5 +31116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31035,5 +31123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31042,5 +31130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31050,5 +31138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31058,5 +31146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31066,5 +31154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31074,5 +31162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31082,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31090,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31098,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31106,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31114,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31123,5 +31211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31131,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31139,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31147,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31155,5 +31243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31163,5 +31251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31171,5 +31259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31179,5 +31267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31187,5 +31275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31195,5 +31283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31203,5 +31291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31211,5 +31299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31219,5 +31307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31227,5 +31315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31235,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31243,5 +31331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31251,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31259,5 +31347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31267,5 +31355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31275,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31282,5 +31370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31312,5 +31400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31320,5 +31408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31328,7 +31416,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31343,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31351,5 +31439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31359,5 +31447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31367,5 +31455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31375,5 +31463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31383,5 +31471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31391,5 +31479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31405,7 +31493,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31415,5 +31503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31423,5 +31511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31431,5 +31519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31439,5 +31527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31447,5 +31535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31455,5 +31543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31463,5 +31551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31471,5 +31559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31479,5 +31567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31487,5 +31575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31495,5 +31583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31503,5 +31591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31511,5 +31599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31519,5 +31607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31527,5 +31615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31535,5 +31623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31543,5 +31631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31551,5 +31639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31559,5 +31647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31567,5 +31655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31575,5 +31663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31583,5 +31671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31591,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31599,5 +31687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31607,5 +31695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31615,5 +31703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31623,5 +31711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31631,5 +31719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31639,5 +31727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31647,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31655,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31663,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31671,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31679,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31687,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31695,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31703,5 +31791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31711,5 +31799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31719,5 +31807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31727,5 +31815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31735,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31743,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31777,7 +31865,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31787,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31795,5 +31883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31803,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31811,5 +31899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31819,5 +31907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31827,5 +31915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31835,5 +31923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31850,5 +31938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31858,5 +31946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31866,5 +31954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31874,5 +31962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31882,5 +31970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31890,5 +31978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31899,5 +31987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31907,5 +31995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31915,5 +32003,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31923,5 +32011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31930,5 +32018,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31937,5 +32025,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31953,7 +32041,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31963,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31971,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31979,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31987,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31995,5 +32083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32003,5 +32091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32011,5 +32099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32019,5 +32107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32027,5 +32115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32043,5 +32131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32055,5 +32143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32067,5 +32155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32075,5 +32163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32087,5 +32175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32099,6 +32187,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32108,5 +32196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32120,5 +32208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32132,5 +32220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32144,5 +32232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32156,5 +32244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32168,5 +32256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32176,7 +32264,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32186,5 +32274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32194,5 +32282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32202,5 +32290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32210,5 +32298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32225,5 +32313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32236,5 +32324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32248,5 +32336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32260,5 +32348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32272,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32281,5 +32369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32289,5 +32377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32297,5 +32385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32305,5 +32393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32313,5 +32401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32328,5 +32416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32340,5 +32428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32352,5 +32440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32364,5 +32452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32376,5 +32464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32389,5 +32477,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?
@@ -32413,5 +32501,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32422,11 +32510,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32436,5 +32524,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32444,5 +32532,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32452,5 +32540,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32460,5 +32548,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32468,5 +32556,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32476,5 +32564,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32484,5 +32572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32492,5 +32580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32500,5 +32588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32508,5 +32596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32516,5 +32604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32524,5 +32612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32542,5 +32630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32635,5 +32723,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32641,28 +32729,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
@@ -32777,5 +32865,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32788,5 +32876,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>
@@ -32811,6 +32899,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32819,6 +32907,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32833,6 +32921,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
@@ -32846,6 +32934,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
@@ -32865,6 +32953,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32888,6 +32976,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
@@ -32909,4 +32997,5 @@
 #~ msgstr "Vis ikke igen"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Send venligst en fejlrapport på {0}"
@@ -32960,7 +33049,9 @@
 #~ 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}"
@@ -33015,4 +33106,5 @@
 #~ 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}"
@@ -33021,10 +33113,13 @@
 #~ 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}"
@@ -33039,4 +33134,5 @@
 #~ msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} inden for sporet."
@@ -33045,7 +33141,9 @@
 #~ 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}\"."
@@ -33083,4 +33181,5 @@
 #~ msgstr "Åbn fil (som rå GPS, hvis .gpx)"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33092,8 +33191,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."
@@ -33108,4 +33207,5 @@
 #~ msgstr "udredet udgave:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33119,7 +33219,9 @@
 #~ 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"
@@ -33143,4 +33245,5 @@
 #~ 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}"
@@ -33156,6 +33259,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 "
@@ -33171,4 +33274,5 @@
 #~ msgstr "unavngivet"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -33238,10 +33342,12 @@
 #~ "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'.)"
-
+#~ "(Du kan rette antallet af dage mellem denne advarsel vises<br>ved at rette i "
+#~ "indstillingen 'pluginmanager.warntime'.)"
+
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Brug forudindstilling \"{0}\""
@@ -33257,6 +33363,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 "
@@ -33284,4 +33390,5 @@
 #~ msgstr "GPS-enhedens tidszone (forskel fra foto)"
 
+#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-slut: {0}"
@@ -33308,7 +33415,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."
 
@@ -33391,13 +33498,17 @@
 #~ 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 "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}\"."
@@ -33412,7 +33523,9 @@
 #~ 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}"
@@ -33427,4 +33540,5 @@
 #~ 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 ""
@@ -33434,4 +33548,5 @@
 #~ 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 "
@@ -33440,6 +33555,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}"
@@ -33464,10 +33579,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."
-
+#~ "Returnér alle valgte objekter til den version, der er valgt i historiklisten."
+
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relations-editor: {0}"
@@ -33476,4 +33591,5 @@
 #~ msgstr "Login"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan ikke åbne mappen for indstillinger: {0}"
@@ -33485,7 +33601,9 @@
 #~ 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}\""
@@ -33497,4 +33615,5 @@
 #~ msgstr "Kun to punkter er tilladt."
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33524,4 +33643,5 @@
 #~ 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"
@@ -33570,6 +33690,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 "
@@ -33580,13 +33700,14 @@
 #~ "elements have a history."
 #~ msgstr ""
-#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede "
-#~ "elementer har en historik."
-
+#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede elementer "
+#~ "har en historik."
+
+#, java-format
 #~ 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, "
@@ -33597,6 +33718,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 "
@@ -33613,6 +33734,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,36 +33756,35 @@
 #~ "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?"
-
+#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et datalag?"
+
+#, java-format
 #~ 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."
+
+#, 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."
@@ -33700,4 +33820,5 @@
 #~ msgstr "Flere detaljer"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33713,4 +33834,5 @@
 #~ "Upload ikke noget data efter denne besked."
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Skift først projiceringen til {0}."
@@ -33719,4 +33841,5 @@
 #~ msgstr "Ugyldig projicering"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33733,4 +33856,5 @@
 #~ "Upload ikke noget data efter denne besked."
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Tjekker om punktet {0} er væk ..."
@@ -33739,4 +33863,5 @@
 #~ msgstr "Gendanner relation..."
 
+#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Tjekker om primitiven {0} er væk ..."
@@ -33787,4 +33912,5 @@
 #~ 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}."
@@ -33797,6 +33923,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."
@@ -33806,10 +33932,11 @@
 #~ 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"
@@ -33822,4 +33949,5 @@
 #~ msgstr "Hent tilknytninger fra OSM..."
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -33831,10 +33959,12 @@
 #~ "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 "
@@ -33848,10 +33978,11 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Hjæ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}"
@@ -33860,17 +33991,21 @@
 #~ 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>"
-
+#~ "<html>Der er uløste konflikter i lag ''{0}''.<br>Du er nødt til at løse dem "
+#~ "først.</html>"
+
+#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Forventede instans af OsmDataLayer eller GpxLayer. Fik ''{0}''."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' må ikke være nul"
@@ -33888,24 +34023,28 @@
 #~ "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>"
-
+#~ "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
 #~ 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."
@@ -33914,13 +34053,23 @@
 #~ 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"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr ""
+#~ "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!"
+
 #~ msgid "Wrong number of parameters for tags operator."
 #~ 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 "
@@ -33930,4 +34079,5 @@
 #~ msgstr "Forkert antal parametre for punkt operatør."
 
+#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -33937,13 +34087,17 @@
 #~ "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}."
@@ -33952,4 +34106,5 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
@@ -33958,4 +34113,5 @@
 #~ msgstr "Bekræftelse"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "Parameter ''{0}'' må ikke være tom."
@@ -33965,4 +34121,5 @@
 #~ msgstr "Lukket"
 
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Uploader {0} objekter ..."
@@ -33978,6 +34135,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 ""
@@ -33986,13 +34143,19 @@
 #~ "      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}."
 
+#~ msgid "Apply also for children"
+#~ msgstr "Anvend også for børn"
+
 #~ msgid "Dialog not created yet. Invoke createInstance() first"
 #~ 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}''"
@@ -34005,28 +34168,34 @@
 #~ "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>"
-
+#~ "<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
 #~ 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>"
-
+#~ "disse primitivers roller.<br>Ønsker du virkelig at anvende den nye "
+#~ "rolle?</html>"
+
+#, java-format
 #~ 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}."
@@ -34042,15 +34211,19 @@
 
 #~ 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"
+#~ msgstr "Fejl under download"
 
 #~ msgid "Download Area"
 #~ msgstr "Download område"
 
+#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -34058,4 +34231,5 @@
 #~ msgstr[1] "{0} Udvidelse problemfrit downloadet."
 
+#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -34069,9 +34243,10 @@
 #~ 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 "
@@ -34080,12 +34255,13 @@
 #~ "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 ""
@@ -34095,15 +34271,13 @@
 #~ 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."
-
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ "Hold højre museknap og flyt musen eller brug piletaster. <b>Markér:</b> Hold "
+#~ "venstre museknap og træk en ramme."
+
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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 "
@@ -34111,6 +34285,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34125,4 +34298,5 @@
 #~ msgstr "<flere>"
 
+#, java-format
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Slet gammel udvidelsesfil {0}"
@@ -34132,7 +34306,8 @@
 #~ "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. "
@@ -34146,72 +34321,95 @@
 
 #~ 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."
-
+#~ "Aktivering af de opdaterede udvidelser fejlede. Tjek om JOSM har tilladelse "
+#~ "til at overskrive de eksisterende udvidelser."
+
+#, java-format
 #~ 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>"
-
+#~ "<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
 #~ 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}."
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/de.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:03+0000\n"
+"POT-Creation-Date: 2010-06-07 09:15+0200\n"
+"PO-Revision-Date: 2010-06-05 21:44+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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +263,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -437,6 +437,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -652,12 +652,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1469,5 +1469,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1488,5 +1489,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1659,5 +1660,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -2272,6 +2273,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "Fehler beim Herunterladen"
 
@@ -2306,6 +2307,6 @@
 msgstr "({0}/{1}) Eltern der Relation {2} laden"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr "Fehler beim Herunterladen"
 
@@ -2571,10 +2572,10 @@
 msgstr "<Dateiende>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Suchen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Nach Objekten suchen."
@@ -2582,41 +2583,41 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Bitte einen Filterbegriff eingeben."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Bitte einen Suchbegriff eingeben."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Geben Sie einen Suchausdruck ein"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "in der Auswahl suchen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
@@ -2624,5 +2625,5 @@
 "Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
@@ -2630,13 +2631,13 @@
 "Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Ber</b> - ''Ber'' irgendwo im Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - Schlüssel ''type'' mit exakt dem Wert ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2646,21 +2647,21 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Ber</b> - kein ''Ber'' im Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, ''true'', ''1'' oder ''on''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - Schlüssel=foot mit beliebigem Wert."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Spezialsuchen:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2668,9 +2669,9 @@
 "<b>type:</b> - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - Alle von diesem Nutzer geänderten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
@@ -2678,9 +2679,9 @@
 "wurden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - Objekte mit der angegebenen ID (0 für neue Objekte)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2690,5 +2691,5 @@
 "Version)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2698,5 +2699,5 @@
 "für Objekte ohne Änderungssatz)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2706,5 +2707,5 @@
 "oder nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2714,5 +2715,9 @@
 "oder <b>tags: min-max</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr "<b>role:</b>... - Objekt mit gegebener Rolle in einer Relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2722,21 +2727,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> oder <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Alle geänderten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Alle ausgewählten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Alle unvollständigen Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Alle Objekte ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2745,5 +2750,5 @@
 "Ausdrucks"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2752,10 +2757,10 @@
 "Ausdrucks"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 "Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2763,5 +2768,5 @@
 "enthält)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2772,11 +2777,11 @@
 "<b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Nutzung von <b>(</b> und <b>)</b> zum Gruppieren von Ausdrücken."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2784,33 +2789,33 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Suche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Filter bestätigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Suche starten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nichts gefunden für Suche ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
@@ -2818,5 +2823,5 @@
 "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2824,5 +2829,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2830,5 +2835,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2836,5 +2841,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2852,15 +2857,20 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+"Der reguläre Ausdruck \"{0}\" hat einen Fehler. Fehlermeldung:\n"
+"{1}"
+
+#: ../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 ""
 "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2869,36 +2879,36 @@
 "\"relation\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unerwartete Kennung: erwartet {0}, erhalten {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unerwartete Daten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Fehlendes Argument für 'OR'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Fehlender Operator für 'NOT'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Erwarte eine Objekt-ID"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Erwarte einen Zahlenbereich"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Änderungssatz-Nummer benötigt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Version erwartet"
@@ -2971,5 +2981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3615,5 +3625,5 @@
 "enthalten ist"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3682,5 +3692,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3688,5 +3698,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3694,17 +3704,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Text"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "K"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3712,5 +3716,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3719,5 +3723,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3725,5 +3729,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3731,5 +3735,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3737,42 +3741,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filter aktiv</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> Objekte versteckt"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> Objekte ausgeblendet"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3783,5 +3787,5 @@
 "Änderungssatz-Nummer ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3789,5 +3793,5 @@
 msgstr "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3859,81 +3863,81 @@
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Zeichenstil des inneren Weges ''{0}'' entspricht dem Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Fehler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4554,6 +4558,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4568,4 +4572,5 @@
 msgstr "Bearbeiten"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4768,5 +4773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5115,6 +5120,7 @@
 msgstr "Alle Serverwerte ins Ziel kopieren"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5126,5 +5132,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Runter"
@@ -5469,6 +5475,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5481,6 +5487,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5850,6 +5856,5 @@
 msgstr "Eine Webseite für jeden ausgewählten Änderungssatz öffnen"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5873,5 +5878,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5879,5 +5884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5979,13 +5984,13 @@
 msgstr "Konflikte lösen für ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Objekte filtern und verbergen/deaktivieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5994,45 +5999,41 @@
 msgstr "Hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Filter hinzufügen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Filter bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Filter löschen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Filter nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Filter nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Filter aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Elemente verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Auch auf Kinder anwenden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Filter invertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Filtermodus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6261,10 +6262,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
@@ -6623,4 +6624,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7925,5 +7927,5 @@
 msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7932,23 +7934,23 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7957,5 +7959,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7964,77 +7966,81 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Element von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr "Position"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Relation auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Relation in Hauptauswahl übernehmen."
@@ -8763,4 +8769,5 @@
 msgstr "Suche nach Namen ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -9454,5 +9461,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Auswahldialog für Datei öffnen"
@@ -10365,5 +10372,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10679,64 +10686,68 @@
 msgstr "Automatisch ermitteln"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr "Ordnet das erste Foto dem ersten GPS-Punkt zu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Manuell justieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Position überschreiben für: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Fotos mit Ortsinformationen in EXIF-Daten ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Bilder die bereits markiert sind ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Vorschaubilder auf der Karte anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Zeitzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Bilder mit GPS-Spur korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ungültige Zeitzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ungültiger Offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Erneut versuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Es gibt keine passenden Bilder!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Keine GPS-Spur ausgewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10747,20 +10758,20 @@
 "<html><b>{0}</b> von <b>{1}</b> Bildern an GPS-Spur angepaßt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zeitzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10769,5 +10780,5 @@
 msgstr[1] "(Zeitunterschied von {0} Tagen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10778,21 +10789,21 @@
 "synchonisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Zeitzone und Offset anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Die gewählten Bilder enthalten keine Zeitinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Bilder enthalten keine Zeitinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10802,17 +10813,17 @@
 "andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPS-Spur enthält keine Zeitinformationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Wählen Sie eine GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Keine GPS-Spur gewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10823,5 +10834,5 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10874,14 +10885,14 @@
 msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10890,5 +10901,5 @@
 msgstr[1] "{0} Bilder geladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10897,10 +10908,10 @@
 msgstr[1] "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Bilddatei von der Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10911,5 +10922,5 @@
 "</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Bilddatei konnte nicht gelöscht werden."
@@ -11883,35 +11894,31 @@
 msgstr "Live-Tonspur anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Explizite Wegpunkte mit gültigen Zeitstempeln."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Explizite Wegpunkte mit Zeitschätzung aus GPS-Position."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Benannte GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Modifizierte Zeiten (Zeitstempel) der Audiodateien."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 "GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Den Audio-Eintrag im Hauptmenü anzeigen oder verbergen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11921,5 +11928,5 @@
 "synchronisierten GPS-Spur der aktuell abgespielte Ton aufgenommen wurde."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11928,23 +11935,15 @@
 "Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Markenebene automatisch aus Wegpunkten erzeugen, wenn eine GPX-Ebene "
-"geöffnet wird."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Beim Importieren von Audio, Marken erzeugen aus..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Importiertes Audio an allen Wegpunkten in der GPX-Ebene anbringen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11954,5 +11953,5 @@
 "erzeugen (anstatt explizit aus Wegpunkten)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11962,5 +11961,5 @@
 "gehörenden Position der GPS-Spur erstellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11970,18 +11969,18 @@
 "zurück gesprungen werden soll"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Schrittweite vorwärts/zurück (s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 "Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Beschleunigungsfaktor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11991,9 +11990,9 @@
 "(negative Werte für später)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Ton-Vorlauf (s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
@@ -12001,5 +12000,5 @@
 "vergangenen Zeit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Kalibrierung der Tonaufzeichnung"
@@ -12039,5 +12038,5 @@
 msgstr "Farben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12048,35 +12047,35 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Lokale Dateien"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Keine"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Linien erzwingen, wenn keine Abschnitte importiert wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Große GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Kreisförmig die Genauigkeit des GPS-Signals (HDOP) anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Geschwindigkeit (rot = langsam, grün = schnell)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Positionsverschlechterung (rot = hoch, grün = niedrig; nur wenn verfügbar)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Positionsverschlechterung (rot = hoch, grün = niedrig; nur wenn verfügbar)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -12084,5 +12083,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12104,5 +12103,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12144,5 +12143,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12156,50 +12155,62 @@
 msgstr "Zu Fuß"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Richtungspfeile zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Schnelles Zeichnen (schlechtere Qualität)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Nur am Ende des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Ordnungsnummer des Abschnitts anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuelle Knoten im Auswahlmodus zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr "Marken beim Einlesen von GPX erstellen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Markenebene automatisch aus Wegpunkten erzeugen, wenn eine GPX-Ebene "
+"geöffnet wird."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12209,9 +12220,9 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12220,10 +12231,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12232,10 +12243,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12244,5 +12255,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12251,13 +12262,13 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12267,9 +12278,9 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12279,5 +12290,5 @@
 "Ihr GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12285,23 +12296,23 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Richtungspfeile für Wegabschnitte zeichnen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12310,10 +12321,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12322,9 +12333,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-Daten"
@@ -12449,6 +12460,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Plugins aktualisieren"
@@ -14735,10 +14746,16 @@
 "aktualisiert werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "lade Plugin ''{0}'' (Version {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14749,24 +14766,18 @@
 "nicht gefunden wurde.<br>Aus den Einstellungen entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Plugins laden..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Plugin-Anforderungen prüfen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Plugin {0} laden..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14774,5 +14785,5 @@
 msgstr[1] "JOSM konnte keine Informationen über die folgenden Plugins finden:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14780,17 +14791,17 @@
 msgstr[1] "Diese Plugins werden nicht geladen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Herausfinden, welche Plugins geladen werden sollen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Veraltete Plugins entfernen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Entferne nicht mehr gepflegte Plugins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14798,5 +14809,5 @@
 msgstr[1] "Die folgenden Plugins konnten nicht aktualisiert werden:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14812,36 +14823,36 @@
 "Sie die Aktualisierung manuell durch."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Plugin-Aktualisierung fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Achtung: Plugin-Informationen konnten nicht herunter geladen werden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Plugin \"{0}\" entfernen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Plugin behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Plugin \"{0}\" behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
@@ -14849,6 +14860,6 @@
 "Warnung: Das Entfernen des veralteten Plugins \"{0}\" ist fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14859,5 +14870,5 @@
 "fehlgeschlagen. JOSM wird weiterhin die alte Version des Plugins nutzen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14868,10 +14879,10 @@
 "''{1}'' ist fehlgeschlagen. Die Datei konnte nicht umbenannt werden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Plugin \"{0}\" deaktivieren"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14881,10 +14892,10 @@
 "ausgelöst haben könnte."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14893,9 +14904,9 @@
 "Plugins, bevor Sie den Fehler melden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14905,14 +14916,14 @@
 "um das Plugin zu entfernen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Plugin-Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -15345,5 +15356,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -16721,34 +16732,35 @@
 msgstr "Lambert-Zonenfehler zwischenspeichern"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Verwenden"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Bitte auswählen, welches Farbschema verwendet werden soll."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Farbschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Bitte auswählen, welches Farbschema gelöscht werden soll."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Das in der Liste gewählte Schema verwenden."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Die aktuellen Farben als neues Farbschema speichern."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Das ausgewählte Farbschema aus der Liste löschen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Farbschemata"
@@ -16824,5 +16836,5 @@
 msgstr "Ebene zum Ändern von GPS-Spuren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "In GPX-Ebene mit anonymer Zeit konvertieren"
@@ -16913,4 +16925,5 @@
 msgstr "Schnittstelle:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -18583,4 +18596,12 @@
 msgid "Terrace"
 msgstr "Abteilen"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr "Bewegen"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr "Karte mit linker Maustaste bewegen"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -20282,5 +20303,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr "Zeigt die aktuelle Position im Video"
@@ -20691,9 +20712,6 @@
 msgstr "WMS-Dateien (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20704,10 +20722,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Datenbank ist zur Wartung offline"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20718,16 +20736,16 @@
 "osm."
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "Aus der Eingabedatei konnten keine Audiodaten gelesen werden."
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Audiogerät nicht verfügbar"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
@@ -20735,10 +20753,10 @@
 "hochzuladen."
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr "Ort"
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20749,14 +20767,14 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "Forst"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr "Farmland"
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20842,5 +20860,5 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20854,5 +20872,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr "Multipolygon"
@@ -20931,5 +20949,5 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20939,62 +20957,63 @@
 msgstr "Route"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Optionale Attribute:"
-
+msgstr "Attribute"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Hilfstasten:"
-
+msgstr "Geändert"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Dateiname"
-
+msgstr "Dateiname:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Zauntreppe"
-
+msgstr "Größe"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Kraftstoffsorten:"
-
+msgstr "Dateityp:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Webseite"
-
+msgstr "Home"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoistisch"
-
+msgstr "Liste"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Hineinzoomen"
-
+msgstr "Suchen in:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Neue Rolle"
-
+msgstr "Neuer Ordner"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Einen neuen Knoten erstellen."
-
+msgstr "Neuen Ordner erstellen"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Speichern"
-
+msgstr "Speichern in:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
-msgstr ""
+msgstr "Eine Ebene höher"
 
 #. Plugin AddrInterpolation
@@ -21271,6 +21290,15 @@
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+"Stellt Hilfsknöpfe zum Arbeiten mit nur einer Maustaste (Stylus-Maus) zur "
+"Verfügung. Momentan wird ein Knopf zum Verschieben der Karte angelegt."
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21281,5 +21309,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21290,10 +21318,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21305,5 +21333,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21316,5 +21344,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21326,15 +21354,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 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:93
+#: build/trans_plugins.java:95
 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:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21345,5 +21373,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33690,2 +33718,18 @@
 msgid "Sicily - Italy"
 msgstr "Sizilien - Italien"
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
+
+#~ msgid "Errors during Download"
+#~ msgstr "Fehler beim Herunterladen"
+
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!"
+
+#~ msgid "Apply also for children"
+#~ msgstr "Auch auf Kinder anwenden"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "K"
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/el.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-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-02 08:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -233,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -256,6 +256,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -310,6 +310,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 ""
 
@@ -333,9 +333,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
@@ -426,6 +426,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -639,12 +639,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1441,5 +1441,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1460,5 +1461,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1608,5 +1609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Εμφάνιση αναφοράς κατάστασης με χρήσιμες πληροφορίες οι οποίες μπορούν να "
@@ -1630,5 +1632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1751,5 +1753,6 @@
 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
@@ -1838,5 +1841,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
@@ -1904,9 +1908,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 +1927,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2217,7 +2221,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Σφάλματα κατά την λήψη"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Σφάλματα κατα τη διάρκεια της μεταφόρτωσης"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2251,7 +2255,7 @@
 msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Σφάλματα κατα τη διάρκεια της μεταφόρτωσης"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2383,6 +2387,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 ""
 
@@ -2470,6 +2474,6 @@
 "move zoom with right button"
 msgstr ""
-"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας Ctrl"
-"+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού"
+"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας "
+"Ctrl+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2509,70 +2513,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Αναζήτηση..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Αναζήτηση αντικειμένων."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "αντικατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "προσθήκη στην επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "αφαίρεση από την επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "διαχωρισμός πεζών/κεφαλαίων"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - ''Baker'' και ''Street'' σε οποιοδήποτε κλειδί ή όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - ''Baker Street'' σε οποιοδήποτε κλειδί ή όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' οπουδήποτε στο όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2580,38 +2584,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - χωρίς ''Bak'' στο όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - κλειδί=foot ορισμένο με οποιαδήποτε τιμή."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2619,5 +2623,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2625,11 +2629,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2637,5 +2641,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2643,39 +2651,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - όλα τα αλλαγμένα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - όλα τα επιλεγμένα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - όλα τα ημιτελή αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - όλα τα αντικείμενα χωρίς ετικέτες"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2683,11 +2691,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2695,38 +2703,38 @@
 msgstr "Φίλτρο"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Έναρξη αναζήτησης"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Δεν βρέθηκε τίποτα στην επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2734,5 +2742,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2740,5 +2748,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2746,5 +2754,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2759,50 +2767,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2866,5 +2877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3072,7 +3083,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> Αυτό "
@@ -3336,6 +3347,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 ""
 
@@ -3418,5 +3429,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3425,5 +3436,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3432,5 +3443,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3467,5 +3478,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3518,5 +3529,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3524,5 +3535,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3530,17 +3541,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "κείμενο"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3548,5 +3553,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3555,5 +3560,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3561,5 +3566,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3567,5 +3572,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3573,42 +3578,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3617,5 +3622,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3623,5 +3628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3677,5 +3682,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3685,81 +3691,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Βρέθηκαν περισότερες απο μία διαδρομή \"από\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Βρέθηκαν περισότερες απο μία διαδρομή \"προς\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Βρέθηκαν περισότερα απο ένα \"μέσω\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Οδός \"από\" δεν βρέθηκε."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Δεν βρέθηκε \"προς\" διαδρομή."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Δεν βρέθηκε \"μέσω' κόμβος ή διαδρομή."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Η διαδρομή \"από\" δεν αρχίζει ούτε τελειώνει στον κόμβο \"μέσω\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Η διαδρομή \"προς\" δεν αρχίζει ούτε τελειώνει στον κόμβο \"μέσω\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Η διαδρομή \"από\" δεν αρχίζει ούτε τελιώνει στη διαδρομή \"μέσω\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Η διαδρομή \"προς\" δεν αρχίζει ούτε τελιώνει στη διαδρομή \"μέσω\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Σφάλμα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3933,5 +3939,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -4002,5 +4009,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4010,5 +4017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4017,5 +4024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4024,5 +4031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4031,5 +4038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4038,5 +4045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4045,9 +4052,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4362,6 +4369,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4376,4 +4383,5 @@
 msgstr "Επεξεργασία"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4566,5 +4574,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4603,6 +4611,6 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+"too.</html>"
 msgstr ""
 
@@ -4633,5 +4641,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4640,5 +4648,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4647,5 +4655,5 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4861,5 +4869,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4884,6 +4893,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4895,5 +4905,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Κάτω"
@@ -4939,6 +4949,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 ""
 
@@ -4946,6 +4956,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 ""
 
@@ -4996,6 +5006,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 ""
 
@@ -5212,6 +5222,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5224,6 +5234,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5521,7 +5531,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 ""
 
@@ -5546,5 +5556,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5562,6 +5573,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5585,5 +5595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5591,5 +5601,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5664,9 +5674,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5684,13 +5695,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5699,45 +5710,41 @@
 msgstr "Προσθήκη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5804,5 +5811,6 @@
 #: ../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
@@ -5964,10 +5972,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6311,4 +6319,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7422,6 +7431,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 ""
 
@@ -7445,8 +7454,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 ""
 
@@ -7566,5 +7575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7573,23 +7582,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Αλλαγή τιμών;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7598,5 +7607,5 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7605,78 +7614,83 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Ιδιότητες/Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Μέλος του"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
-msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+msgstr ""
+"Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7791,6 +7805,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 ""
 
@@ -7808,6 +7822,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 ""
 
@@ -7962,6 +7976,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8298,6 +8313,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8357,4 +8373,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8437,6 +8454,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 ""
 
@@ -8446,6 +8463,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 ""
 
@@ -8719,8 +8736,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8735,7 +8753,8 @@
 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 ""
 
@@ -8971,5 +8990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8986,5 +9005,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Το επίπεδο \"{0}\" έχει αλλαγές που πρέπει να αποσταλλούν στον διακομιστή."
@@ -9070,6 +9090,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] ""
@@ -9083,6 +9103,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 "
@@ -9310,5 +9330,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9334,5 +9354,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9387,6 +9408,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 ""
 
@@ -9440,7 +9461,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 ""
 
@@ -9450,5 +9471,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9473,5 +9494,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9689,7 +9711,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 ""
 
@@ -9715,7 +9737,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 ""
 
@@ -9779,6 +9801,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θεωρείτε "
@@ -9794,5 +9816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9959,6 +9981,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 ""
 
@@ -10018,7 +10040,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 ""
 
@@ -10083,64 +10105,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Ζώνη Ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Μετατόπιση:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Συσχέτιση"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Λανθασμένη ζώνη ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10150,20 +10176,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Ζώνη ώρας: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Λεπτά: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Δευτερόλεπτα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10172,5 +10198,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10178,21 +10204,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10200,17 +10226,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Δεν επιλέχθηκε ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10219,5 +10245,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10268,14 +10294,14 @@
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10284,5 +10310,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10291,10 +10317,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10303,5 +10329,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10593,6 +10619,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 ""
 
@@ -10614,8 +10640,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 ""
 
@@ -10735,6 +10761,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 ""
 
@@ -10844,5 +10870,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10976,8 +11003,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 ""
 
@@ -11060,8 +11087,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 ""
 
@@ -11088,7 +11115,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 ""
 
@@ -11161,26 +11188,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Ονομασμένα σημεία ίχνους."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -11188,9 +11211,9 @@
 "σημεία διαθέσιμα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Εμφάνιση ή απόκρυψη του μενού ήχου από την κύρια γραμμή μενού"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11198,5 +11221,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11204,21 +11227,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Κατα την εισαγωγή ήχου, δημιουργία σημαδιών από..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11226,5 +11243,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11232,5 +11249,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11238,17 +11255,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11256,13 +11273,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Βαθμονόμηση καταγραφέα ήχου"
@@ -11302,5 +11319,5 @@
 msgstr "Χρώματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11311,34 +11328,34 @@
 msgstr "Όλα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Τοπικά αρχεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Κανένα"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Force lines if no segments imported."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Σχεδιασμός μεγάλων σημείων GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Ταχύτητα (κόκκινο = αργό, πράσινο = γρήγορο)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11346,5 +11363,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11366,5 +11383,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11406,5 +11423,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11418,50 +11435,60 @@
 msgstr "Πεζοί"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Σχεδιασμός Βελών Κατεύθυνσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)"
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+msgid "Only on the head of a way."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
-msgid "Only on the head of a way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11469,9 +11496,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11480,25 +11507,26 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Μέγιστο μήκος (μέτρα)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11506,13 +11534,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Ελάχιστη απόσταση (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11520,9 +11548,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11530,47 +11558,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Σημεία GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Εφαρμογή antialiasing σετην προβολή χάρτη με αποτέλεσμα ομαλότερη απεικόνηση."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Δεδομένα OSM"
@@ -11642,5 +11671,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11689,6 +11719,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11765,6 +11795,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 ""
 
@@ -11777,9 +11807,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 ""
 
@@ -11923,5 +11953,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:151
 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
@@ -12077,6 +12108,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 ""
 
@@ -12198,6 +12229,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 ""
 
@@ -12219,6 +12250,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 ""
 
@@ -12297,5 +12328,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12311,5 +12343,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12403,6 +12436,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 ""
 
@@ -12698,5 +12731,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
@@ -12881,5 +12914,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13264,6 +13298,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 ""
 
@@ -13291,6 +13325,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 ""
 
@@ -13332,5 +13366,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13762,14 +13797,20 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13778,24 +13819,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13803,5 +13838,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13809,17 +13844,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13827,5 +13862,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13837,42 +13872,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Απενεργοποίηση πρόσθετου"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Διατήρηση πρόσθετου"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13881,5 +13916,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13888,10 +13923,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -13901,10 +13936,10 @@
 "''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Σύμφωνα με τις πληροφορίες του πρόσθετου, συγγραφέας είναι ο {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -13913,9 +13948,9 @@
 "κάντε αναφορά για bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Να απενεργοποιηθεί το πρόσθετο;"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13925,14 +13960,14 @@
 "να αποφορτωθεί το πρόσθετο."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "δεν υπάρχει περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13973,5 +14008,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14033,5 +14069,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"
@@ -14114,6 +14150,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 ""
 
@@ -14121,7 +14157,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 ""
 
@@ -14129,7 +14165,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 ""
 
@@ -14137,8 +14173,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 ""
 
@@ -14158,7 +14194,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 ""
 
@@ -14227,6 +14263,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14238,7 +14275,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 ""
 
@@ -14270,9 +14307,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14332,6 +14369,6 @@
 "\n"
 msgstr ""
-"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια "
-"''{1}'' ({2}) απέτυχε\n"
+"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια ''{1}'' "
+"({2}) απέτυχε\n"
 "γιατί η συντόμευση είναι ήδη πιασμένη από την ενέργεια ''{3}'' ({4}).\n"
 "\n"
@@ -14936,7 +14973,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14946,5 +14983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14954,5 +14991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14968,5 +15005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14976,5 +15013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15005,5 +15042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15012,5 +15049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15019,5 +15056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15026,5 +15063,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15033,5 +15070,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15040,5 +15077,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15072,10 +15109,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15555,34 +15593,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Να χρησιμοποιηθεί"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Παρακαλώ επιλέξτε ένα θέμα για χρήση."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Θέμα χρωμάτων"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Παρακαλώ επιλέξτε το θέμα προς διαγραφή"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Χρήση του επιλεγμένου θέματος από την λίστα."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Χρήση των τρεχόντων χρωμάτων ως νέο θέμα."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Διαγραφή του επιλεγμένου θέματος από την λίστα."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Θέματα χρωμάτων"
@@ -15658,5 +15697,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15747,4 +15786,5 @@
 msgstr "Θύρα:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15954,5 +15994,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16073,5 +16113,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16090,9 +16131,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 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."
 
@@ -16112,5 +16154,6 @@
 #: ../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
@@ -16407,5 +16450,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Η κεφαλίδα περιέχει πολλαπλές τιμές και δεν μπορεί να αντιστοιχηθεί σε ένα "
@@ -16519,5 +16563,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16570,5 +16615,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17384,4 +17430,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17826,6 +17880,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 ""
 
@@ -17911,8 +17965,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 ""
 
@@ -17966,8 +18020,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 ""
 
@@ -18079,6 +18133,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 ""
 
@@ -18086,6 +18140,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 ""
 
@@ -18187,5 +18241,6 @@
 #: ../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
@@ -18724,6 +18779,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18870,5 +18926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18968,5 +19024,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19344,9 +19400,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19357,10 +19410,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Η βάση δεδομένων είναι εκτός λειτουργίας λόγω συντήρησης"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19368,25 +19421,26 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr ""
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Μη διαθέσιμη Συσκευή Ήχου"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
-msgstr "Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
-
-#. use has not made edits public
-#: build/specialmessages.java:12
+msgstr ""
+"Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
+
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19394,17 +19448,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "δάσος"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19412,7 +19466,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19422,5 +19476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19463,5 +19517,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19471,5 +19525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19479,5 +19533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19487,8 +19541,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19502,5 +19556,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19511,5 +19565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19518,7 +19572,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19528,5 +19582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19536,5 +19590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19544,5 +19598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19552,5 +19606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19560,5 +19614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19568,5 +19622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19576,8 +19630,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19587,57 +19641,60 @@
 msgstr "διαδρομή"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Μπαταρίες"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "κανένας τροποποιητής"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Όνομα αρχείου"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Ιστοσελίδα"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "ταοϊσμός"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Μεγέθυνση"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Νέος ρόλος"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Δημιουργία νέου κόμβου."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Αποθήκευση"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19708,5 +19765,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19872,6 +19930,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19880,5 +19945,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19887,10 +19952,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19899,5 +19964,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19907,5 +19972,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19917,15 +19982,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19934,5 +19999,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20822,7 +20887,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20962,8 +21027,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"/>
@@ -21173,5 +21238,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21181,5 +21246,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21198,5 +21263,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21206,5 +21271,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21223,5 +21288,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21231,5 +21296,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21248,5 +21313,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21256,5 +21321,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21269,5 +21334,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21285,5 +21350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21301,5 +21366,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21308,5 +21373,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21316,5 +21381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21334,5 +21399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21341,5 +21406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21349,5 +21414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22051,5 +22116,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22100,5 +22165,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22195,5 +22260,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22361,5 +22426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22693,5 +22758,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22701,5 +22766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22709,5 +22774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22717,5 +22782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22725,5 +22790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22733,5 +22798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22741,5 +22806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22750,5 +22815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24168,5 +24233,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24176,5 +24241,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24184,5 +24249,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24192,5 +24257,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24554,7 +24619,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24564,5 +24629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24572,5 +24637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24580,5 +24645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24588,5 +24653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24596,5 +24661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24604,5 +24669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24612,5 +24677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24620,5 +24685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24628,5 +24693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24636,5 +24701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24644,5 +24709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24652,5 +24717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24660,5 +24725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24668,5 +24733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24676,5 +24741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24684,5 +24749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24692,5 +24757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24700,5 +24765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24708,5 +24773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24716,5 +24781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24724,5 +24789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24732,5 +24797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24740,5 +24805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24748,5 +24813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24756,5 +24821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24764,5 +24829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24772,5 +24837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24780,5 +24845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24788,5 +24853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24796,5 +24861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24804,5 +24869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24812,5 +24877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24820,5 +24885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24828,5 +24893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24836,5 +24901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24844,5 +24909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24852,5 +24917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24860,5 +24925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24868,5 +24933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24876,5 +24941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24884,5 +24949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24892,5 +24957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24900,5 +24965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24908,5 +24973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24916,5 +24981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24924,5 +24989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26628,7 +26693,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26638,5 +26703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26646,5 +26711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26654,5 +26719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26662,5 +26727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26670,5 +26735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26678,5 +26743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26686,5 +26751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26694,5 +26759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28115,5 +28180,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28129,5 +28194,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28137,5 +28202,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28146,5 +28211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28157,7 +28222,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28167,5 +28232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28175,5 +28240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28183,5 +28248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28191,5 +28256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28223,5 +28288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28237,5 +28302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28245,5 +28310,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28252,5 +28317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28260,5 +28325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28269,5 +28334,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28292,5 +28357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28405,9 +28470,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
@@ -28415,5 +28480,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,
@@ -28423,8 +28488,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
@@ -28438,5 +28503,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28444,5 +28509,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28491,6 +28556,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>
@@ -28570,5 +28635,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28578,11 +28643,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28598,5 +28663,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28605,5 +28670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28612,5 +28677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28626,5 +28691,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28638,5 +28703,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28645,5 +28710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28652,5 +28717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28659,5 +28724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28666,5 +28731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28673,5 +28738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28680,5 +28745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28687,5 +28752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28694,5 +28759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28701,5 +28766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28708,5 +28773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28715,5 +28780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28722,5 +28787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28729,5 +28794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28736,5 +28801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28911,7 +28976,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28925,5 +28990,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28933,7 +28998,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28943,5 +29008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28951,5 +29016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28959,5 +29024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28967,5 +29032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28981,5 +29046,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28988,5 +29053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28996,5 +29061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29003,5 +29068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29010,5 +29075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29017,5 +29082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29024,5 +29089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29031,5 +29096,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29038,5 +29103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29045,5 +29110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29052,5 +29117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29059,5 +29124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29071,5 +29136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29083,5 +29148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29090,5 +29155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29102,5 +29167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29115,5 +29180,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29128,5 +29193,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29140,5 +29205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29152,5 +29217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29159,5 +29224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29166,5 +29231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29174,5 +29239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29181,5 +29246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29188,5 +29253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29195,5 +29260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29203,5 +29268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29212,5 +29277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29220,7 +29285,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29230,5 +29295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29238,5 +29303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29246,5 +29311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29255,5 +29320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29262,5 +29327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29270,5 +29335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29278,5 +29343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29286,5 +29351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29294,5 +29359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29302,5 +29367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29310,5 +29375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29318,5 +29383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29326,5 +29391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29334,5 +29399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29355,5 +29420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29368,7 +29433,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29378,5 +29443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29385,5 +29450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29393,5 +29458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29400,5 +29465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29408,5 +29473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29416,5 +29481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29430,5 +29495,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29439,5 +29504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29456,5 +29521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29464,5 +29529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29475,5 +29540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29492,5 +29557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29499,5 +29564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29506,5 +29571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29513,7 +29578,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29524,5 +29589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29537,5 +29602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29549,5 +29614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29557,5 +29622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29569,5 +29634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29581,5 +29646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29588,5 +29653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29595,7 +29660,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29605,5 +29670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29613,5 +29678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29621,5 +29686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29629,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29637,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29651,7 +29716,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29666,5 +29731,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29679,5 +29744,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29692,5 +29757,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29705,5 +29770,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29718,5 +29783,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29731,7 +29796,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29741,5 +29806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29748,5 +29813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29756,5 +29821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29764,5 +29829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29772,5 +29837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29780,5 +29845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29788,5 +29853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29796,5 +29861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29804,5 +29869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29812,5 +29877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29820,5 +29885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29828,5 +29893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29836,5 +29901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29854,5 +29919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29867,5 +29932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29878,7 +29943,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29888,5 +29953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29896,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29904,5 +29969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29912,5 +29977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29920,5 +29985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29928,5 +29993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29936,5 +30001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29944,5 +30009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29952,5 +30017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29960,5 +30025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29968,5 +30033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29976,5 +30041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29984,5 +30049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29992,5 +30057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30000,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30008,5 +30073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30028,5 +30093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30040,7 +30105,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30050,5 +30115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30058,5 +30123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30066,5 +30131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30074,5 +30139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30082,5 +30147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30090,5 +30155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30098,5 +30163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30106,5 +30171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30114,5 +30179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30122,5 +30187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30139,5 +30204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30147,5 +30212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30155,5 +30220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30163,5 +30228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30171,5 +30236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30179,5 +30244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30187,5 +30252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30195,5 +30260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30203,5 +30268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30211,5 +30276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30219,5 +30284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30227,5 +30292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30244,5 +30309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30251,5 +30316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30259,5 +30324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30266,5 +30331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30274,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30282,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30290,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30297,5 +30362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30305,5 +30370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30313,5 +30378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30321,5 +30386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30329,5 +30394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30336,5 +30401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30343,5 +30408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30350,5 +30415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30357,5 +30422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30364,5 +30429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30371,5 +30436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30378,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30385,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30392,5 +30457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30399,5 +30464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30406,5 +30471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30413,5 +30478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30420,5 +30485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30428,5 +30493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30436,5 +30501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30444,5 +30509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30452,5 +30517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30460,5 +30525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30468,5 +30533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30476,5 +30541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30484,5 +30549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30492,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30501,5 +30566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30509,5 +30574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30517,5 +30582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30525,5 +30590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30533,5 +30598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30541,5 +30606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30549,5 +30614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30557,5 +30622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30565,5 +30630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30573,5 +30638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30581,5 +30646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30589,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30597,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30605,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30613,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30621,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30629,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30637,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30645,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30653,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30660,5 +30725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30690,5 +30755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30698,5 +30763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30706,7 +30771,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30721,5 +30786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30729,5 +30794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30737,5 +30802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30745,5 +30810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30753,5 +30818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30761,5 +30826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30769,5 +30834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30783,7 +30848,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30793,5 +30858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30801,5 +30866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30809,5 +30874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30817,5 +30882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30825,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30833,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30841,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30849,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30857,5 +30922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30865,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30873,5 +30938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30881,5 +30946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30889,5 +30954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30897,5 +30962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30905,5 +30970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30913,5 +30978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30921,5 +30986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30929,5 +30994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30937,5 +31002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30945,5 +31010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30953,5 +31018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30961,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30969,5 +31034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30977,5 +31042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30985,5 +31050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30993,5 +31058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31001,5 +31066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31009,5 +31074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31017,5 +31082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31025,5 +31090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31033,5 +31098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31041,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31049,5 +31114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31057,5 +31122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31065,5 +31130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31073,5 +31138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31081,5 +31146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31089,5 +31154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31097,5 +31162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31105,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31113,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31121,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31155,7 +31220,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31165,5 +31230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31173,5 +31238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31181,5 +31246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31189,5 +31254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31197,5 +31262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31205,5 +31270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31213,5 +31278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31228,5 +31293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31236,5 +31301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31244,5 +31309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31252,5 +31317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31260,5 +31325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31268,5 +31333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31277,5 +31342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31285,5 +31350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31293,5 +31358,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31301,5 +31366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31308,5 +31373,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31315,5 +31380,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31331,7 +31396,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31341,5 +31406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31349,5 +31414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31357,5 +31422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31365,5 +31430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31373,5 +31438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31381,5 +31446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31389,5 +31454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31397,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31405,5 +31470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31421,5 +31486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31433,5 +31498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31445,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31453,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31465,5 +31530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31477,6 +31542,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31486,5 +31551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31498,5 +31563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31510,5 +31575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31522,5 +31587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31534,5 +31599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31546,5 +31611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31554,7 +31619,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31564,5 +31629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31572,5 +31637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31580,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31588,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31603,5 +31668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31614,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31626,5 +31691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31638,5 +31703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31650,5 +31715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31659,5 +31724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31667,5 +31732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31675,5 +31740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31683,5 +31748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31691,5 +31756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31706,5 +31771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31718,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31730,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31742,5 +31807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31754,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31767,5 +31832,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?
@@ -31791,5 +31856,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31800,11 +31865,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31814,5 +31879,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31822,5 +31887,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31830,5 +31895,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31838,5 +31903,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31846,5 +31911,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31854,5 +31919,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31862,5 +31927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31870,5 +31935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31878,5 +31943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31886,5 +31951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31894,5 +31959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31902,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31920,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32013,5 +32078,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32019,28 +32084,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
@@ -32155,5 +32220,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32166,5 +32231,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>
@@ -32189,6 +32254,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32197,6 +32262,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32211,6 +32276,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
@@ -32224,6 +32289,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
@@ -32243,6 +32308,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32266,6 +32331,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
@@ -32285,6 +32350,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
-#~ "οποία πήρατε το JOSM για το πρόβλημα."
+#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα οποία "
+#~ "πήρατε το JOSM για το πρόβλημα."
 
 #~ msgid "Preparing..."
@@ -32303,7 +32368,9 @@
 #~ msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Δεν βρέθηκε το πρόσθετο: {0}."
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}."
@@ -32327,4 +32394,5 @@
 #~ msgstr "Όλες οι εικόνες"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32336,4 +32404,5 @@
 #~ " {0}"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32351,11 +32420,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 και όλων των "
@@ -32395,4 +32464,5 @@
 #~ msgstr "Άνοιγμα σε Φυλλομετρητή"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
@@ -32414,9 +32484,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."
@@ -32424,6 +32494,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32442,13 +32511,17 @@
 #~ 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}"
@@ -32465,9 +32538,10 @@
 #~ 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}"
@@ -32475,6 +32549,5 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς "
-#~ "γίνεται)!"
+#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!"
 
 #~ msgid "Be sure to include the following information:"
@@ -32484,4 +32557,5 @@
 #~ msgstr "διαφορετικά"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32498,16 +32572,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?"
@@ -32535,7 +32609,9 @@
 #~ 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}\"."
@@ -32547,6 +32623,6 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί "
-#~ "ο κωδικός."
+#~ "Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο "
+#~ "κωδικός."
 
 #~ msgid "Update"
@@ -32578,9 +32654,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:"
@@ -32605,7 +32681,9 @@
 #~ 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}"
@@ -32614,4 +32692,5 @@
 #~ msgstr "Λήψη πρόσθετων που λείπουν"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32620,6 +32699,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την "
-#~ "τρέχουσα έκδοση διαγράφοντας το υπάρχον αρχείο;\n"
+#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την τρέχουσα "
+#~ "έκδοση διαγράφοντας το υπάρχον αρχείο;\n"
 #~ "\n"
 #~ "{0}"
@@ -32653,12 +32732,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>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
 #~ msgid "Email"
@@ -32669,7 +32747,9 @@
 #~ "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Χρήση προεπιλογής \"{0}\""
@@ -32681,4 +32761,5 @@
 #~ msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} μέσα στο ίχνος"
@@ -32699,7 +32780,9 @@
 #~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Συγγραφείς: {0}"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Σωρός Εντολών: {0}"
@@ -32797,6 +32880,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή "
-#~ "ή ξαναδοκιμάστε αργότερα."
+#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή ή "
+#~ "ξαναδοκιμάστε αργότερα."
 
 #~ msgid "There were conflicts during import."
@@ -32806,4 +32889,5 @@
 #~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι."
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
@@ -32821,4 +32905,5 @@
 #~ msgstr "Επιβεβαίωση συγχώνευσης"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -32828,10 +32913,16 @@
 #~ "συνεχίσετε;"
 
+#~ msgid "Errors during Download"
+#~ 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}"
@@ -32843,4 +32934,5 @@
 #~ msgstr "επιλυμένη έκδοση:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32863,4 +32955,5 @@
 #~ msgstr "Μετακίνηση Πάνω"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Επεξεργαστής Σχέσεων: {0}"
@@ -32875,7 +32968,9 @@
 #~ 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} πρώτα."
@@ -32898,4 +32993,5 @@
 #~ msgstr "Εμφάνιση πίνακα Συγγραφέα"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Παρακαλώ αναφέρετε ένα δελτίο στο {0}"
@@ -32920,9 +33016,8 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
-#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
-#~ "επίπεδο δεδομένων;"
+#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα επίπεδο "
+#~ "δεδομένων;"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -32936,10 +33031,11 @@
 #~ "διακομιστή."
 
+#, 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."
@@ -32999,14 +33095,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>."
-
+#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</A> ή "
+#~ "<A HREF=\"{1}\">στη γλώσσα σας</A>."
+
+#, java-format
 #~ 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 21602)
+++ /applications/editors/josm/i18n/po/en_AU.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-03-28 15:27+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-02 08:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -262,6 +262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -316,9 +316,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
@@ -341,9 +341,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
@@ -434,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -649,12 +649,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -915,5 +915,6 @@
 "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
@@ -1460,5 +1461,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1479,5 +1481,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1629,5 +1631,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Show status report with useful information that can be attached to bugs"
@@ -1650,5 +1653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1859,6 +1862,8 @@
 
 #: ../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
@@ -1929,9 +1934,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)"
@@ -1948,5 +1953,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2243,7 +2248,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Errors during download"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2277,7 +2282,7 @@
 msgstr "({0}/{1}) Loading parents of relation {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2411,9 +2416,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
@@ -2538,68 +2543,68 @@
 msgstr "<end-of-file>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Search..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Search for objects."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Please enter a filter string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Please enter a search string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Enter the search expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "replace selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "add to selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "remove from selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "find in selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "case sensitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regular expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - key ''type'' with value exactly ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2609,21 +2614,21 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - not ''Bak'' in the name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 or on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot set to any value."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Special targets:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2631,17 +2636,17 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - all objects changed by user"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - all objects changed by anonymous users"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - object with given ID (0 for new objects)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2651,5 +2656,5 @@
 "assigned version)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2659,13 +2664,13 @@
 "assigned changeset)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2675,5 +2680,9 @@
 "max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2683,21 +2692,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - all changed objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - all selected objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - all incomplete objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - all untagged objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2705,5 +2714,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2711,13 +2720,13 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2727,11 +2736,11 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Use <b>(</b> and <b>)</b> to group expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2739,38 +2748,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Submit filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No match found for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nothing added to selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nothing removed from selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nothing found in selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2778,5 +2787,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2784,5 +2793,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2790,5 +2799,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2806,50 +2815,54 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+msgstr ""
+"Unknown primitive type: {0}. Allowed values are node, way or relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unexpected token. Expected {0}, found {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Missing parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Missing operator for NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Primitive id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Range of numbers expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Changeset id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Version expected"
@@ -2919,5 +2932,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3130,11 +3143,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:459
@@ -3411,9 +3424,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
@@ -3503,5 +3516,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3510,5 +3523,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3517,5 +3530,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3553,5 +3566,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3610,5 +3623,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3616,5 +3629,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3622,17 +3635,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Text"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3640,5 +3647,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3647,5 +3654,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3653,5 +3660,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3659,5 +3666,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3665,42 +3672,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "A primitive with ID = 0 cannot be invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "version > 0 expected. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3711,5 +3718,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3719,5 +3726,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3776,6 +3783,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 "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
@@ -3784,81 +3793,81 @@
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Area style way is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "The \"from\" way does not start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "The \"to\" way does not start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "The \"from\" way does not start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "The \"to\" way does not start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Style for restriction {0} not found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Style for outer way ''{0}'' mismatches."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4034,5 +4043,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4104,5 +4114,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4112,5 +4122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4119,5 +4129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4126,5 +4136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4133,5 +4143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4140,5 +4150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4147,9 +4157,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4376,5 +4386,6 @@
 #: ../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
@@ -4472,6 +4483,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4486,4 +4497,5 @@
 msgstr "Edit"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4685,5 +4697,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4724,11 +4736,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
@@ -4758,5 +4770,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"
@@ -4765,5 +4777,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"
@@ -4772,5 +4784,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"
@@ -4996,6 +5008,8 @@
 
 #: ../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
@@ -5023,6 +5037,7 @@
 msgstr "Copy all their elements to the target"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5034,5 +5049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Down"
@@ -5077,6 +5092,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>"
@@ -5085,9 +5100,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
@@ -5139,9 +5154,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
@@ -5369,6 +5384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5381,6 +5396,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5677,5 +5692,6 @@
 #: ../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
@@ -5693,11 +5709,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
@@ -5721,6 +5737,8 @@
 
 #: ../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
@@ -5737,6 +5755,5 @@
 msgstr "Open a web page for each selected changeset"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5760,5 +5777,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5766,5 +5783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5838,15 +5855,17 @@
 #, 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
@@ -5863,13 +5882,13 @@
 msgstr "Resolve conflicts for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filter objects and hide/disable them."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5878,45 +5897,41 @@
 msgstr "Add"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Add filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Edit filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Delete filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Move filter up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Move filter down."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Enable filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Hide elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Apply also for children"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Inverse filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Filter mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6143,10 +6158,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -6303,5 +6318,6 @@
 #: ../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
@@ -6498,4 +6514,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7632,9 +7649,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
@@ -7661,8 +7678,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 ""
 
@@ -7767,5 +7784,6 @@
 #: ../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
@@ -7786,5 +7804,5 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7793,23 +7811,23 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7818,5 +7836,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7825,77 +7843,81 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
@@ -7963,5 +7985,6 @@
 #, 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
@@ -8012,10 +8035,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
@@ -8032,10 +8055,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
@@ -8192,5 +8215,6 @@
 #: ../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
@@ -8207,9 +8231,11 @@
 #, 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
@@ -8325,5 +8351,6 @@
 #, 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
@@ -8548,9 +8575,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>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
@@ -8609,4 +8638,5 @@
 msgstr "Querying name server ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8689,6 +8719,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 "
@@ -8697,6 +8727,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
@@ -8705,11 +8735,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
@@ -8993,16 +9023,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>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
@@ -9016,12 +9048,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9279,5 +9313,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Launch a file chooser to select a file"
@@ -9294,5 +9328,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -9384,6 +9419,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 "
@@ -9391,6 +9426,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
@@ -9402,6 +9437,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 "
@@ -9410,6 +9445,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 "
@@ -9637,5 +9672,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9665,6 +9700,8 @@
 
 #: ../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
@@ -9729,9 +9766,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
@@ -9787,7 +9824,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 "
@@ -9801,5 +9838,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9826,5 +9863,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Ignoring caught exception because upload is cancelled. Exception is: {0}"
@@ -9857,5 +9895,6 @@
 #, 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 +10092,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 +10121,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:373
@@ -10149,9 +10188,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -10164,5 +10203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10341,9 +10380,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 +10441,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
@@ -10473,64 +10512,68 @@
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Manual adjust"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Override position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Images with geo location in exif data ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Images that are already tagged ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Show Thumbnail images on the map"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Correlate images with GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correlate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Invalid timezone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Invalid offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Try Again"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "No images could be matched!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "No gpx selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10538,22 +10581,23 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+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
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconds: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10562,5 +10606,5 @@
 msgstr[1] "Time difference of {0} days"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10570,21 +10614,21 @@
 "adjust the sliders to manually match the photos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "The selected photos do not contain time information."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Photos do not contain time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10594,17 +10638,17 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX Track has no time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "You should select a GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "No selected GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10615,5 +10659,5 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10666,14 +10710,14 @@
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10682,5 +10726,5 @@
 msgstr[1] "{0} images loaded."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10689,10 +10733,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10703,5 +10747,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -11002,11 +11046,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
@@ -11034,13 +11078,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
@@ -11173,10 +11217,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
@@ -11292,5 +11336,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11429,16 +11474,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
@@ -11530,14 +11575,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
@@ -11569,11 +11614,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
@@ -11643,34 +11688,30 @@
 msgstr "Display live audio trace."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Create non-audio markers when reading GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Explicit waypoints with valid timestamps."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Explicit waypoints with time estimated from track position."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Named trackpoints."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Modified times (time stamps) of audio files."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Start of track (will always do this if no other markers available)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Show or hide the audio menu entry on the main menu bar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11680,5 +11721,5 @@
 "the audio currently playing was recorded."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11688,23 +11729,15 @@
 "button icons."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "When importing audio, make markers from..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "When importing audio, apply it to any waypoints in the GPX layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11714,5 +11747,5 @@
 "waypoints) with names or descriptions."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11722,5 +11755,5 @@
 "modified time of each audio WAV file imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11730,17 +11763,17 @@
 "pressed"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Forwards/back time (seconds)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "The amount by which the speed is multiplied for fast forwarding"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Fast forwards multiplier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11750,13 +11783,13 @@
 "audio track position requested"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Lead-in time (seconds)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "The ratio of voice recorder elapsed time to true elapsed time"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Voice recorder calibration"
@@ -11796,5 +11829,5 @@
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11805,34 +11838,34 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "None"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -11840,5 +11873,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11860,5 +11893,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11900,5 +11933,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11912,50 +11945,62 @@
 msgstr "Foot"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11965,9 +12010,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11975,10 +12020,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11986,16 +12031,17 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Draw the direction arrows using table lookups instead of complex maths."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12005,13 +12051,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12021,9 +12067,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12033,46 +12079,48 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -12144,5 +12192,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12150,6 +12199,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
@@ -12159,5 +12208,6 @@
 "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
@@ -12194,6 +12244,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Update plug-ins"
@@ -12274,12 +12324,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
@@ -12291,9 +12341,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 "
@@ -12303,9 +12353,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
@@ -12610,9 +12660,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:766
@@ -12741,9 +12791,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
@@ -12766,10 +12816,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
@@ -12856,6 +12906,8 @@
 
 #: ../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
@@ -12872,6 +12924,8 @@
 
 #: ../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
@@ -12967,9 +13021,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
@@ -13284,5 +13338,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
@@ -13475,5 +13529,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -13699,5 +13754,6 @@
 #: ../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
@@ -13876,9 +13932,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
@@ -13905,9 +13961,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
@@ -13937,5 +13993,6 @@
 #: ../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
@@ -13948,6 +14005,8 @@
 #: ../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
@@ -14412,16 +14471,21 @@
 #, 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>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+"<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
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Could not load plug-in {0}. Delete from preferences?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14432,23 +14496,18 @@
 "was not found.<br>Delete from preferences?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Could not load plug-in {0}. Delete from preferences?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Loading plug-ins ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Checking plug-in preconditions..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Loading plug-in ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14456,5 +14515,5 @@
 msgstr[1] "JOSM could not find information about the following plug-ins:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14462,17 +14521,17 @@
 msgstr[1] "The plug-ins are not going to be loaded."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Determine plug-ins to load..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Removing deprecated plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Removing unmaintained plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14480,5 +14539,5 @@
 msgstr[1] "Updating the following plug-ins has failed:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14494,42 +14553,42 @@
 "them manually."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Plug-in update failed"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Warning: failed to download plug-in information list"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Disable plug-in"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Click to delete the plug-in ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Keep plug-in"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Click to keep the plug-in ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Warning: failed to delete outdated plug-in ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14540,5 +14599,5 @@
 "installation. JOSM is still going to load the old plug-in version."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14549,22 +14608,22 @@
 "''{1}''. Renaming failed."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Click to disable the plug-in ''{0}''"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"An unexpected exception occurred that may have come from the ''{0}'' plug-in."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"An unexpected exception occurred that may have come from the ''{0}'' plug-in."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "According to the information within the plug-in, the author is {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14572,9 +14631,9 @@
 "Try updating to the newest version of this plug-in before reporting a bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Should the plug-in be disabled?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14584,14 +14643,14 @@
 "unload the plug-in."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Plug-in information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "no description available"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14614,5 +14673,6 @@
 #, 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
@@ -14634,5 +14694,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
@@ -14699,5 +14760,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"
@@ -14801,45 +14862,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
@@ -14858,7 +14919,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 ""
 
@@ -14942,9 +15003,11 @@
 #, 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
@@ -14955,11 +15018,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
@@ -14997,13 +15060,13 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15432,5 +15495,6 @@
 #: ../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
@@ -15701,7 +15765,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15711,5 +15775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15719,5 +15783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15733,5 +15797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15741,5 +15805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15770,5 +15834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15777,5 +15841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15784,5 +15848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15791,5 +15855,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15798,5 +15862,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15805,5 +15869,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15837,17 +15901,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"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."
+"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."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16351,34 +16417,35 @@
 msgstr "Cache Lambert Zone Error"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Use"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Please select a scheme to use."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Colour Scheme"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Please select the scheme to delete."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Use the selected scheme from the list."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Use the current colours as a new colour scheme."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Delete the selected scheme from the list."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Colour Schemes"
@@ -16454,5 +16521,5 @@
 msgstr "Layer for editing GPX tracks"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convert to GPX layer with anonymised time"
@@ -16543,4 +16610,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16753,5 +16821,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16872,6 +16940,8 @@
 
 #: ../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
@@ -16893,9 +16963,11 @@
 #: ../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
@@ -17179,7 +17251,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
@@ -17206,6 +17278,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 "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
@@ -17318,5 +17392,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 "You have unsaved changes in your queue. Do you want to submit them now?"
@@ -17370,5 +17445,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 "Write position information into the exif header of the following files:"
@@ -18189,4 +18265,12 @@
 msgstr "Terrace"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18631,6 +18715,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 ""
 
@@ -18716,8 +18800,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 ""
 
@@ -18771,8 +18855,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 ""
 
@@ -18884,6 +18968,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 ""
 
@@ -18891,6 +18975,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 ""
 
@@ -19520,5 +19604,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
 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:658
@@ -19540,9 +19625,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"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:744
@@ -19688,5 +19775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19786,5 +19873,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -20184,9 +20271,6 @@
 msgstr "WMS Files (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20197,10 +20281,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Database offline for maintenance"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20210,25 +20294,25 @@
 "request a smaller area, or use planet.osm."
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "could not get audio input stream from input URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Audio Device Unavailable"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "You must make your edits public to upload new data"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20236,17 +20320,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "forest"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20254,7 +20338,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20264,5 +20348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20305,5 +20389,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20313,5 +20397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20321,5 +20405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20329,8 +20413,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20344,5 +20428,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20353,5 +20437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20360,7 +20444,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20370,5 +20454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20378,5 +20462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20386,5 +20470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20394,5 +20478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20402,5 +20486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20410,5 +20494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20418,8 +20502,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20429,59 +20513,60 @@
 msgstr "route"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Optional Attributes:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "no modifier"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Filename"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Stile"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Fuel types:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Homepage"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Zoom in"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "New role"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Create new node."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Save"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20564,6 +20649,8 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+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
@@ -20754,6 +20841,13 @@
 msgstr "Make terraced houses out of single blocks."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20764,5 +20858,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20771,10 +20865,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20785,5 +20879,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20793,5 +20887,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20802,15 +20896,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 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:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20821,5 +20915,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21710,7 +21804,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21850,8 +21944,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"/>
@@ -22061,5 +22155,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22069,5 +22163,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22086,5 +22180,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22094,5 +22188,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22111,5 +22205,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22119,5 +22213,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22136,5 +22230,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22144,5 +22238,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22157,5 +22251,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22173,5 +22267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22189,5 +22283,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22196,5 +22290,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22204,5 +22298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22222,5 +22316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22229,5 +22323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22237,5 +22331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22939,5 +23033,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22988,5 +23082,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -23083,5 +23177,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23249,5 +23343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23581,5 +23675,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23589,5 +23683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23597,5 +23691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23605,5 +23699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23613,5 +23707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23621,5 +23715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23629,5 +23723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23638,5 +23732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25056,5 +25150,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25064,5 +25158,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25072,5 +25166,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25080,5 +25174,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25442,7 +25536,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25452,5 +25546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25460,5 +25554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25468,5 +25562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25476,5 +25570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25484,5 +25578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25492,5 +25586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25500,5 +25594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25508,5 +25602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25516,5 +25610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25524,5 +25618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25532,5 +25626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25540,5 +25634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25548,5 +25642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25556,5 +25650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25564,5 +25658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25572,5 +25666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25580,5 +25674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25588,5 +25682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25596,5 +25690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25604,5 +25698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25612,5 +25706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25620,5 +25714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25628,5 +25722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25636,5 +25730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25644,5 +25738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25652,5 +25746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25660,5 +25754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25668,5 +25762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25676,5 +25770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25684,5 +25778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25692,5 +25786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25700,5 +25794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25708,5 +25802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25716,5 +25810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25724,5 +25818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25732,5 +25826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25740,5 +25834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25748,5 +25842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25756,5 +25850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25764,5 +25858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25772,5 +25866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25780,5 +25874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25788,5 +25882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25796,5 +25890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25804,5 +25898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25812,5 +25906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27516,7 +27610,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27526,5 +27620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27534,5 +27628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27542,5 +27636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27550,5 +27644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27558,5 +27652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27566,5 +27660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27574,5 +27668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27582,5 +27676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -29003,5 +29097,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29017,5 +29111,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29025,5 +29119,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -29034,5 +29128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29045,7 +29139,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29055,5 +29149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29063,5 +29157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29071,5 +29165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29079,5 +29173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29111,5 +29205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29125,5 +29219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29133,5 +29227,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29140,5 +29234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29148,5 +29242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29157,5 +29251,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29180,5 +29274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29293,9 +29387,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
@@ -29303,5 +29397,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,
@@ -29311,8 +29405,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
@@ -29326,5 +29420,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29332,5 +29426,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29379,6 +29473,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>
@@ -29458,5 +29552,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29466,11 +29560,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29486,5 +29580,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29493,5 +29587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29500,5 +29594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29514,5 +29608,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29526,5 +29620,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29533,5 +29627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29540,5 +29634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29547,5 +29641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29554,5 +29648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29561,5 +29655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29568,5 +29662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29575,5 +29669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29582,5 +29676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29589,5 +29683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29596,5 +29690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29603,5 +29697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29610,5 +29704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29617,5 +29711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29624,5 +29718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29799,7 +29893,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29813,5 +29907,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29821,7 +29915,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29831,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29839,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29847,5 +29941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29855,5 +29949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29869,5 +29963,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29876,5 +29970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29884,5 +29978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29891,5 +29985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29898,5 +29992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29905,5 +29999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29912,5 +30006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29919,5 +30013,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29926,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29933,5 +30027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29940,5 +30034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29947,5 +30041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29959,5 +30053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29971,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29978,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29990,5 +30084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -30003,5 +30097,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -30016,5 +30110,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -30028,5 +30122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -30040,5 +30134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30047,5 +30141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30054,5 +30148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30062,5 +30156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30069,5 +30163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30076,5 +30170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30083,5 +30177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30091,5 +30185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30100,5 +30194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30108,7 +30202,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30118,5 +30212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30126,5 +30220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30134,5 +30228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30143,5 +30237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30150,5 +30244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30158,5 +30252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30166,5 +30260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30174,5 +30268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30182,5 +30276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30190,5 +30284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30198,5 +30292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30206,5 +30300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30214,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30222,5 +30316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30243,5 +30337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30256,7 +30350,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30266,5 +30360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30273,5 +30367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30281,5 +30375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30288,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30296,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30304,5 +30398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30318,5 +30412,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30327,5 +30421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30344,5 +30438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30352,5 +30446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30363,5 +30457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30380,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30387,5 +30481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30394,5 +30488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30401,7 +30495,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30412,5 +30506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30425,5 +30519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30437,5 +30531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30445,5 +30539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30457,5 +30551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30469,5 +30563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30476,5 +30570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30483,7 +30577,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30493,5 +30587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30501,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30509,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30517,5 +30611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30525,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30539,7 +30633,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30554,5 +30648,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30567,5 +30661,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30580,5 +30674,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30593,5 +30687,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30606,5 +30700,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30619,7 +30713,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30629,5 +30723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30636,5 +30730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30644,5 +30738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30652,5 +30746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30660,5 +30754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30668,5 +30762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30676,5 +30770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30684,5 +30778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30692,5 +30786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30700,5 +30794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30708,5 +30802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30716,5 +30810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30724,5 +30818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30742,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30755,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30766,7 +30860,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30776,5 +30870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30784,5 +30878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30792,5 +30886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30800,5 +30894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30808,5 +30902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30816,5 +30910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30824,5 +30918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30832,5 +30926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30840,5 +30934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30848,5 +30942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30856,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30864,5 +30958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30872,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30880,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30888,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30896,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30916,5 +31010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30928,7 +31022,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30938,5 +31032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30946,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30954,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30962,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30970,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30978,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30986,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30994,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31002,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31010,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -31027,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31035,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31043,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31051,5 +31145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31059,5 +31153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31067,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31075,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31083,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31091,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31099,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31107,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31115,5 +31209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31132,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31139,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31147,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31154,5 +31248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31162,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31170,5 +31264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31178,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31185,5 +31279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31193,5 +31287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31201,5 +31295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31209,5 +31303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31217,5 +31311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31224,5 +31318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31231,5 +31325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31238,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31245,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31252,5 +31346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31259,5 +31353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31266,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31273,5 +31367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31280,5 +31374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31287,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31294,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31301,5 +31395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31308,5 +31402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31316,5 +31410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31324,5 +31418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31332,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31340,5 +31434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31348,5 +31442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31356,5 +31450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31364,5 +31458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31372,5 +31466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31380,5 +31474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31389,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31397,5 +31491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31405,5 +31499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31413,5 +31507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31421,5 +31515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31429,5 +31523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31437,5 +31531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31445,5 +31539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31453,5 +31547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31461,5 +31555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31469,5 +31563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31477,5 +31571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31485,5 +31579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31493,5 +31587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31501,5 +31595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31509,5 +31603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31517,5 +31611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31525,5 +31619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31533,5 +31627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31541,5 +31635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31548,5 +31642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31578,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31586,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31594,7 +31688,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31609,5 +31703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31617,5 +31711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31625,5 +31719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31633,5 +31727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31641,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31649,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31657,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31671,7 +31765,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31681,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31689,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31697,5 +31791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31705,5 +31799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31713,5 +31807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31721,5 +31815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31729,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31737,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31745,5 +31839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31753,5 +31847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31761,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31769,5 +31863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31777,5 +31871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31785,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31793,5 +31887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31801,5 +31895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31809,5 +31903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31817,5 +31911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31825,5 +31919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31833,5 +31927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31841,5 +31935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31849,5 +31943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31857,5 +31951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31865,5 +31959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31873,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31881,5 +31975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31889,5 +31983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31897,5 +31991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31905,5 +31999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31913,5 +32007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31921,5 +32015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31929,5 +32023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31937,5 +32031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31945,5 +32039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31953,5 +32047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31961,5 +32055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31969,5 +32063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31977,5 +32071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31985,5 +32079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31993,5 +32087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32001,5 +32095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32009,5 +32103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -32043,7 +32137,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32053,5 +32147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32061,5 +32155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32069,5 +32163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32077,5 +32171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32085,5 +32179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32093,5 +32187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32101,5 +32195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32116,5 +32210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32124,5 +32218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32132,5 +32226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32140,5 +32234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32148,5 +32242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32156,5 +32250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32165,5 +32259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32173,5 +32267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32181,5 +32275,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32189,5 +32283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32196,5 +32290,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32203,5 +32297,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32219,7 +32313,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32229,5 +32323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32237,5 +32331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32245,5 +32339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32253,5 +32347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32261,5 +32355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32269,5 +32363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32277,5 +32371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32285,5 +32379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32293,5 +32387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32309,5 +32403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32321,5 +32415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32333,5 +32427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32341,5 +32435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32353,5 +32447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32365,6 +32459,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32374,5 +32468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32386,5 +32480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32398,5 +32492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32410,5 +32504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32422,5 +32516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32434,5 +32528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32442,7 +32536,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32452,5 +32546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32460,5 +32554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32468,5 +32562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32476,5 +32570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32491,5 +32585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32502,5 +32596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32514,5 +32608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32526,5 +32620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32538,5 +32632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32547,5 +32641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32555,5 +32649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32563,5 +32657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32571,5 +32665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32579,5 +32673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32594,5 +32688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32606,5 +32700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32618,5 +32712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32630,5 +32724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32642,5 +32736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32655,5 +32749,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?
@@ -32679,5 +32773,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32688,11 +32782,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32702,5 +32796,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32710,5 +32804,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32718,5 +32812,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32726,5 +32820,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32734,5 +32828,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32742,5 +32836,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32750,5 +32844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32758,5 +32852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32766,5 +32860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32774,5 +32868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32782,5 +32876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32790,5 +32884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32808,5 +32902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32901,5 +32995,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32907,28 +33001,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
@@ -33043,5 +33137,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33054,5 +33148,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>
@@ -33077,6 +33171,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33085,6 +33179,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33099,6 +33193,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
@@ -33112,6 +33206,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
@@ -33131,6 +33225,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33154,6 +33248,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
@@ -33166,15 +33260,16 @@
 msgstr "Sicily - Italy"
 
+#, 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>"
 
@@ -33182,10 +33277,26 @@
 #~ msgstr "Deleted or moved primitives"
 
+#~ msgid "Errors during Download"
+#~ 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!"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
 #~ msgid "Gauss-Laborde Réunion 1947"
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Command Stack: {0}"
 
+#~ msgid "Apply also for children"
+#~ msgstr "Apply also for children"
+
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Uploading {0} objects ..."
@@ -33193,4 +33304,7 @@
 #~ msgid "GPS point"
 #~ msgstr "GPS point"
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Create non-audio markers when reading GPX."
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 21603)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-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-02 08:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -91,5 +91,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -265,6 +265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -319,9 +319,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
@@ -344,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
@@ -437,6 +437,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -652,12 +652,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -918,5 +918,6 @@
 "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
@@ -1463,5 +1464,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1482,5 +1484,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1632,5 +1634,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Show status report with useful information that can be attached to bugs"
@@ -1653,5 +1656,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1862,6 +1865,8 @@
 
 #: ../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
@@ -1932,9 +1937,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 +1956,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2246,7 +2251,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Errors during download"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2280,7 +2285,7 @@
 msgstr "({0}/{1}) Loading parents of relation {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2414,9 +2419,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
@@ -2541,68 +2546,68 @@
 msgstr "<end-of-file>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Search..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Search for objects."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Please enter a filter string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Please enter a search string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Enter the search expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "replace selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "add to selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "remove from selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "find in selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "case sensitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regular expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - key ''type'' with value exactly ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2612,21 +2617,21 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - not ''Bak'' in the name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 or on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot set to any value."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Special targets:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2634,17 +2639,17 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - all objects changed by user"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - all objects changed by anonymous users"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - object with given ID (0 for new objects)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2654,5 +2659,5 @@
 "assigned version)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2662,13 +2667,13 @@
 "assigned changeset)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2678,5 +2683,9 @@
 "max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2686,21 +2695,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - all changed objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - all selected objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - all incomplete objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - all untagged objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2708,5 +2717,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2714,13 +2723,13 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2730,11 +2739,11 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Use <b>(</b> and <b>)</b> to group expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2742,38 +2751,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Submit filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No match found for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nothing added to selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nothing removed from selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nothing found in selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2781,5 +2790,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2787,5 +2796,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2793,5 +2802,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2809,50 +2818,54 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+msgstr ""
+"Unknown primitive type: {0}. Allowed values are node, way or relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Unexpected token. Expected {0}, found {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Missing parameter for OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Missing operator for NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Primitive id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Range of numbers expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Changeset id expected"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Version expected"
@@ -2922,5 +2935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3133,11 +3146,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:459
@@ -3414,9 +3427,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
@@ -3506,5 +3519,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3513,5 +3526,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3520,5 +3533,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3556,5 +3569,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3613,5 +3626,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3619,5 +3632,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3625,17 +3638,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Text"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3643,5 +3650,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3650,5 +3657,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3656,5 +3663,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3662,5 +3669,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3668,42 +3675,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "A primitive with ID = 0 cannot be invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "version > 0 expected. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3714,5 +3721,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3722,5 +3729,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3779,6 +3786,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 "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
@@ -3787,81 +3796,81 @@
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Area style way is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "The \"from\" way does not start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "The \"to\" way does not start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "The \"from\" way does not start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "The \"to\" way does not start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Style for restriction {0} not found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Style for outer way ''{0}'' mismatches."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4037,5 +4046,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4107,5 +4117,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4115,5 +4125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4122,5 +4132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4129,5 +4139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4136,5 +4146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4143,5 +4153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4150,9 +4160,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4379,5 +4389,6 @@
 #: ../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
@@ -4475,6 +4486,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4489,4 +4500,5 @@
 msgstr "Edit"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4688,5 +4700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4727,11 +4739,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
@@ -4761,5 +4773,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"
@@ -4768,5 +4780,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"
@@ -4775,5 +4787,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"
@@ -4999,6 +5011,8 @@
 
 #: ../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
@@ -5026,6 +5040,7 @@
 msgstr "Copy all their elements to the target"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5037,5 +5052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Down"
@@ -5080,6 +5095,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>"
@@ -5088,9 +5103,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
@@ -5142,9 +5157,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
@@ -5372,6 +5387,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5384,6 +5399,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5680,5 +5695,6 @@
 #: ../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
@@ -5696,11 +5712,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
@@ -5724,6 +5740,8 @@
 
 #: ../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
@@ -5740,6 +5758,5 @@
 msgstr "Open a web page for each selected changeset"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5763,5 +5780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5769,5 +5786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5841,15 +5858,17 @@
 #, 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
@@ -5866,13 +5885,13 @@
 msgstr "Resolve conflicts for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filter objects and hide/disable them."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5881,45 +5900,41 @@
 msgstr "Add"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Add filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Edit filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Delete filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Move filter up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Move filter down."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Enable filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Hide elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Apply also for children"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Inverse filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Filter mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6146,10 +6161,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -6306,5 +6321,6 @@
 #: ../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
@@ -6501,4 +6517,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7635,9 +7652,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
@@ -7664,8 +7681,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>. "
@@ -7778,5 +7795,6 @@
 #: ../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
@@ -7797,5 +7815,5 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7804,23 +7822,23 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7829,5 +7847,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7836,77 +7854,81 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
@@ -7974,5 +7996,6 @@
 #, 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
@@ -8023,10 +8046,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
@@ -8043,10 +8066,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
@@ -8203,5 +8226,6 @@
 #: ../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
@@ -8218,9 +8242,11 @@
 #, 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
@@ -8336,5 +8362,6 @@
 #, 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
@@ -8559,9 +8586,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>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
@@ -8620,4 +8649,5 @@
 msgstr "Querying name server ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8700,6 +8730,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 "
@@ -8708,6 +8738,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
@@ -8716,11 +8746,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
@@ -9004,16 +9034,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>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
@@ -9027,12 +9059,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9290,5 +9324,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Launch a file chooser to select a file"
@@ -9305,5 +9339,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -9395,6 +9430,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 "
@@ -9402,6 +9437,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
@@ -9413,6 +9448,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 "
@@ -9421,6 +9456,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 "
@@ -9648,5 +9683,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9676,6 +9711,8 @@
 
 #: ../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
@@ -9740,9 +9777,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
@@ -9798,7 +9835,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 "
@@ -9812,5 +9849,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9837,5 +9874,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Ignoring caught exception because upload is cancelled. Exception is: {0}"
@@ -9868,5 +9906,6 @@
 #, 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 +10103,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 +10132,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:373
@@ -10160,9 +10199,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -10175,5 +10214,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10352,9 +10391,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 +10452,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
@@ -10484,64 +10523,68 @@
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Manual adjust"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Override position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Images with geo location in exif data ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Images that are already tagged ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Show Thumbnail images on the map"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Correlate images with GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correlate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Invalid timezone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Invalid offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Try Again"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "No images could be matched!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "No gpx selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10549,22 +10592,23 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+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
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconds: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10573,5 +10617,5 @@
 msgstr[1] "Time difference of {0} days"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10581,21 +10625,21 @@
 "adjust the sliders to manually match the photos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "The selected photos do not contain time information."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Photos do not contain time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10605,17 +10649,17 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX Track has no time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "You should select a GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "No selected GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10626,5 +10670,5 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10677,14 +10721,14 @@
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10693,5 +10737,5 @@
 msgstr[1] "{0} images loaded."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10700,10 +10744,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10714,5 +10758,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -11013,11 +11057,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
@@ -11045,13 +11089,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
@@ -11184,10 +11228,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
@@ -11305,5 +11349,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11442,16 +11487,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
@@ -11543,14 +11588,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
@@ -11582,11 +11627,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
@@ -11656,34 +11701,30 @@
 msgstr "Display live audio trace."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Create non-audio markers when reading GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Explicit waypoints with valid timestamps."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Explicit waypoints with time estimated from track position."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Named trackpoints."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Modified times (time stamps) of audio files."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Start of track (will always do this if no other markers available)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Show or hide the audio menu entry on the main menu bar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11693,5 +11734,5 @@
 "the audio currently playing was recorded."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11701,23 +11742,15 @@
 "button icons."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "When importing audio, make markers from..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "When importing audio, apply it to any waypoints in the GPX layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11727,5 +11760,5 @@
 "waypoints) with names or descriptions."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11735,5 +11768,5 @@
 "modified time of each audio WAV file imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11743,17 +11776,17 @@
 "pressed"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Forwards/back time (seconds)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "The amount by which the speed is multiplied for fast forwarding"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Fast forwards multiplier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11763,13 +11796,13 @@
 "audio track position requested"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Lead-in time (seconds)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "The ratio of voice recorder elapsed time to true elapsed time"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Voice recorder calibration"
@@ -11809,5 +11842,5 @@
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11818,34 +11851,34 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "None"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -11853,5 +11886,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11873,5 +11906,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11913,5 +11946,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11925,50 +11958,62 @@
 msgstr "Foot"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11978,9 +12023,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11988,10 +12033,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11999,16 +12044,17 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Draw the direction arrows using table lookups instead of complex maths."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12018,13 +12064,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12034,9 +12080,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12046,46 +12092,48 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -12157,5 +12205,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12163,6 +12212,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
@@ -12172,5 +12221,6 @@
 "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
@@ -12207,6 +12257,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Update plug-ins"
@@ -12287,12 +12337,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
@@ -12304,9 +12354,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 "
@@ -12316,9 +12366,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
@@ -12623,9 +12673,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:766
@@ -12754,9 +12804,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
@@ -12779,10 +12829,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
@@ -12869,6 +12919,8 @@
 
 #: ../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
@@ -12885,6 +12937,8 @@
 
 #: ../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
@@ -12980,9 +13034,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
@@ -13297,5 +13351,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
@@ -13488,5 +13542,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -13712,5 +13767,6 @@
 #: ../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
@@ -13889,9 +13945,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
@@ -13918,9 +13974,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
@@ -13950,5 +14006,6 @@
 #: ../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
@@ -13961,6 +14018,8 @@
 #: ../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
@@ -14425,16 +14484,21 @@
 #, 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>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+"<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
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Could not load plug-in {0}. Delete from preferences?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "loading plugin ''{0}'' (version {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14445,23 +14509,18 @@
 "was not found.<br>Delete from preferences?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Could not load plug-in {0}. Delete from preferences?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Loading plug-ins ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Checking plug-in preconditions..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Loading plug-in ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14469,5 +14528,5 @@
 msgstr[1] "JOSM could not find information about the following plug-ins:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14475,17 +14534,17 @@
 msgstr[1] "The plug-ins are not going to be loaded."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Determine plug-ins to load..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Removing deprecated plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Removing unmaintained plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14493,5 +14552,5 @@
 msgstr[1] "Updating the following plug-ins has failed:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14507,42 +14566,42 @@
 "them manually."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Plug-in update failed"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Warning: failed to download plug-in information list"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Disable plug-in"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Click to delete the plug-in ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Keep plug-in"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Click to keep the plug-in ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Warning: failed to delete outdated plug-in ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14553,5 +14612,5 @@
 "installation. JOSM is still going to load the old plug-in version."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14562,22 +14621,22 @@
 "''{1}''. Renaming failed."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Click to disable the plug-in ''{0}''"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"An unexpected exception occurred that may have come from the ''{0}'' plug-in."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"An unexpected exception occurred that may have come from the ''{0}'' plug-in."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "According to the information within the plug-in, the author is {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14585,9 +14644,9 @@
 "Try updating to the newest version of this plug-in before reporting a bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Should the plug-in be disabled?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14597,14 +14656,14 @@
 "unload the plug-in."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Plug-in information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "no description available"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14627,5 +14686,6 @@
 #, 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
@@ -14647,5 +14707,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
@@ -14712,5 +14773,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"
@@ -14814,45 +14875,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
@@ -14873,12 +14934,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
@@ -14963,9 +15024,11 @@
 #, 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
@@ -14976,11 +15039,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
@@ -15018,13 +15081,13 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15453,5 +15516,6 @@
 #: ../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
@@ -15724,7 +15788,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15734,5 +15798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15742,5 +15806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15756,5 +15820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15764,5 +15828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15793,5 +15857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15800,5 +15864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15807,5 +15871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15814,5 +15878,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15821,5 +15885,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15828,5 +15892,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15860,17 +15924,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"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."
+"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."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16374,34 +16440,35 @@
 msgstr "Cache Lambert Zone Error"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Use"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Please select a scheme to use."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Colour Scheme"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Please select the scheme to delete."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Use the selected scheme from the list."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Use the current colours as a new colour scheme."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Delete the selected scheme from the list."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Colour Schemes"
@@ -16477,5 +16544,5 @@
 msgstr "Layer for editing GPX tracks"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convert to GPX layer with anonymised time"
@@ -16566,4 +16633,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16776,5 +16844,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16895,6 +16963,8 @@
 
 #: ../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
@@ -16916,9 +16986,11 @@
 #: ../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
@@ -17202,7 +17274,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
@@ -17229,6 +17301,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 "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
@@ -17341,5 +17415,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 "You have unsaved changes in your queue. Do you want to submit them now?"
@@ -17393,5 +17468,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 "Write position information into the exif header of the following files:"
@@ -18211,4 +18287,12 @@
 msgid "Terrace"
 msgstr "Terrace"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -18674,6 +18758,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 ""
 
@@ -18759,8 +18843,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 ""
 
@@ -18814,8 +18898,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 ""
 
@@ -18927,6 +19011,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 ""
 
@@ -18934,6 +19018,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 ""
 
@@ -19563,5 +19647,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
 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:658
@@ -19583,9 +19668,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"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:744
@@ -19731,5 +19818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19829,5 +19916,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -20227,9 +20314,6 @@
 msgstr "WMS Files (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20240,10 +20324,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Database offline for maintenance"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20253,25 +20337,25 @@
 "request a smaller area, or use planet.osm."
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "could not get audio input stream from input URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Audio Device Unavailable"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "You must make your edits public to upload new data"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20279,17 +20363,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "forest"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20297,7 +20381,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20307,5 +20391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20348,5 +20432,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20356,5 +20440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20364,5 +20448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20372,8 +20456,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20387,5 +20471,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20396,5 +20480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20403,7 +20487,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20413,5 +20497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20421,5 +20505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20429,5 +20513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20437,5 +20521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20445,5 +20529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20453,5 +20537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20461,8 +20545,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20472,59 +20556,60 @@
 msgstr "route"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Optional Attributes:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "no modifier"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Filename"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Stile"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Fuel types:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Homepage"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Zoom in"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "New role"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Create new node."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Save"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20607,6 +20692,8 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+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
@@ -20797,6 +20884,13 @@
 msgstr "Make terraced houses out of single blocks."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20807,5 +20901,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20816,10 +20910,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20830,5 +20924,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20838,5 +20932,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20847,15 +20941,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 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:93
+#: build/trans_plugins.java:95
 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:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20866,5 +20960,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21755,7 +21849,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21895,8 +21989,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"/>
@@ -22106,5 +22200,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22114,5 +22208,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22131,5 +22225,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22139,5 +22233,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22156,5 +22250,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22164,5 +22258,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22181,5 +22275,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22189,5 +22283,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22202,5 +22296,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22218,5 +22312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22234,5 +22328,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22241,5 +22335,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22249,5 +22343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22267,5 +22361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22274,5 +22368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22282,5 +22376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22984,5 +23078,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -23033,5 +23127,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -23128,5 +23222,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23294,5 +23388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23626,5 +23720,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23634,5 +23728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23642,5 +23736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23650,5 +23744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23658,5 +23752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23666,5 +23760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23674,5 +23768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23683,5 +23777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25101,5 +25195,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25109,5 +25203,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25117,5 +25211,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25125,5 +25219,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25487,7 +25581,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25497,5 +25591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25505,5 +25599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25513,5 +25607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25521,5 +25615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25529,5 +25623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25537,5 +25631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25545,5 +25639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25553,5 +25647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25561,5 +25655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25569,5 +25663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25577,5 +25671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25585,5 +25679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25593,5 +25687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25601,5 +25695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25609,5 +25703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25617,5 +25711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25625,5 +25719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25633,5 +25727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25641,5 +25735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25649,5 +25743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25657,5 +25751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25665,5 +25759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25673,5 +25767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25681,5 +25775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25689,5 +25783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25697,5 +25791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25705,5 +25799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25713,5 +25807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25721,5 +25815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25729,5 +25823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25737,5 +25831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25745,5 +25839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25753,5 +25847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25761,5 +25855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25769,5 +25863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25777,5 +25871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25785,5 +25879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25793,5 +25887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25801,5 +25895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25809,5 +25903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25817,5 +25911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25825,5 +25919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25833,5 +25927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25841,5 +25935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25849,5 +25943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25857,5 +25951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27561,7 +27655,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27571,5 +27665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27579,5 +27673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27587,5 +27681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27595,5 +27689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27603,5 +27697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27611,5 +27705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27619,5 +27713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27627,5 +27721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -29048,5 +29142,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29062,5 +29156,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29070,5 +29164,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -29079,5 +29173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29090,7 +29184,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29100,5 +29194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29108,5 +29202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29116,5 +29210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29124,5 +29218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29156,5 +29250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29170,5 +29264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29178,5 +29272,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29185,5 +29279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29193,5 +29287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29202,5 +29296,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29225,5 +29319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29338,9 +29432,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
@@ -29348,5 +29442,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,
@@ -29356,8 +29450,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
@@ -29371,5 +29465,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29377,5 +29471,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29424,6 +29518,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>
@@ -29503,5 +29597,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29511,11 +29605,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29531,5 +29625,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29538,5 +29632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29545,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29559,5 +29653,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29571,5 +29665,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29578,5 +29672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29585,5 +29679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29592,5 +29686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29599,5 +29693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29606,5 +29700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29613,5 +29707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29620,5 +29714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29627,5 +29721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29634,5 +29728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29641,5 +29735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29648,5 +29742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29655,5 +29749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29662,5 +29756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29669,5 +29763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29844,7 +29938,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29858,5 +29952,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29866,7 +29960,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29876,5 +29970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29884,5 +29978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29892,5 +29986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29900,5 +29994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29914,5 +30008,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29921,5 +30015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29929,5 +30023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29936,5 +30030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29943,5 +30037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29950,5 +30044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29957,5 +30051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29964,5 +30058,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29971,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29978,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29985,5 +30079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29992,5 +30086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -30004,5 +30098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -30016,5 +30110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30023,5 +30117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -30035,5 +30129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -30048,5 +30142,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -30061,5 +30155,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -30073,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -30085,5 +30179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30092,5 +30186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30099,5 +30193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30107,5 +30201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30114,5 +30208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30121,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30128,5 +30222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30136,5 +30230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30145,5 +30239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30153,7 +30247,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30163,5 +30257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30171,5 +30265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30179,5 +30273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30188,5 +30282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30195,5 +30289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30203,5 +30297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30211,5 +30305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30219,5 +30313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30227,5 +30321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30235,5 +30329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30243,5 +30337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30251,5 +30345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30259,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30267,5 +30361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30288,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30301,7 +30395,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30311,5 +30405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30318,5 +30412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30326,5 +30420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30333,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30341,5 +30435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30349,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30363,5 +30457,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30372,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30389,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30397,5 +30491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30408,5 +30502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30425,5 +30519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30432,5 +30526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30439,5 +30533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30446,7 +30540,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30457,5 +30551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30470,5 +30564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30482,5 +30576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30490,5 +30584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30502,5 +30596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30514,5 +30608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30521,5 +30615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30528,7 +30622,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30538,5 +30632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30546,5 +30640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30554,5 +30648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30562,5 +30656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30570,5 +30664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30584,7 +30678,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30599,5 +30693,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30612,5 +30706,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30625,5 +30719,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30638,5 +30732,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30651,5 +30745,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30664,7 +30758,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30674,5 +30768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30681,5 +30775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30689,5 +30783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30697,5 +30791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30705,5 +30799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30713,5 +30807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30721,5 +30815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30729,5 +30823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30737,5 +30831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30745,5 +30839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30753,5 +30847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30761,5 +30855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30769,5 +30863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30787,5 +30881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30800,5 +30894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30811,7 +30905,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30821,5 +30915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30829,5 +30923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30837,5 +30931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30845,5 +30939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30853,5 +30947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30861,5 +30955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30869,5 +30963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30877,5 +30971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30885,5 +30979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30893,5 +30987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30901,5 +30995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30909,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30917,5 +31011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30925,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30933,5 +31027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30941,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30961,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30973,7 +31067,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30983,5 +31077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30991,5 +31085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30999,5 +31093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31007,5 +31101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31015,5 +31109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31023,5 +31117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31031,5 +31125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31039,5 +31133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31047,5 +31141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31055,5 +31149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -31072,5 +31166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31080,5 +31174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31088,5 +31182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31096,5 +31190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31104,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31112,5 +31206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31120,5 +31214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31128,5 +31222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31136,5 +31230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31144,5 +31238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31152,5 +31246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31160,5 +31254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31177,5 +31271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31184,5 +31278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31192,5 +31286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31199,5 +31293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31207,5 +31301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31215,5 +31309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31223,5 +31317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31230,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31238,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31246,5 +31340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31254,5 +31348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31262,5 +31356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31269,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31276,5 +31370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31283,5 +31377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31290,5 +31384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31297,5 +31391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31304,5 +31398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31311,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31318,5 +31412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31325,5 +31419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31332,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31339,5 +31433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31346,5 +31440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31353,5 +31447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31361,5 +31455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31369,5 +31463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31377,5 +31471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31385,5 +31479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31393,5 +31487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31401,5 +31495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31409,5 +31503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31417,5 +31511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31425,5 +31519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31434,5 +31528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31442,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31450,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31458,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31466,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31474,5 +31568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31482,5 +31576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31490,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31498,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31506,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31514,5 +31608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31522,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31530,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31538,5 +31632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31546,5 +31640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31554,5 +31648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31562,5 +31656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31570,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31578,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31586,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31593,5 +31687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31623,5 +31717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31631,5 +31725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31639,7 +31733,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31654,5 +31748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31662,5 +31756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31670,5 +31764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31678,5 +31772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31686,5 +31780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31694,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31702,5 +31796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31716,7 +31810,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31726,5 +31820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31734,5 +31828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31742,5 +31836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31750,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31758,5 +31852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31766,5 +31860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31774,5 +31868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31782,5 +31876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31790,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31798,5 +31892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31806,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31814,5 +31908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31822,5 +31916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31830,5 +31924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31838,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31846,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31854,5 +31948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31862,5 +31956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31870,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31878,5 +31972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31886,5 +31980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31894,5 +31988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31902,5 +31996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31910,5 +32004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31918,5 +32012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31926,5 +32020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31934,5 +32028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31942,5 +32036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31950,5 +32044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31958,5 +32052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31966,5 +32060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31974,5 +32068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31982,5 +32076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31990,5 +32084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31998,5 +32092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32006,5 +32100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32014,5 +32108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32022,5 +32116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32030,5 +32124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32038,5 +32132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32046,5 +32140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32054,5 +32148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -32088,7 +32182,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32098,5 +32192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32106,5 +32200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32114,5 +32208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32122,5 +32216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32130,5 +32224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32138,5 +32232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32146,5 +32240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32161,5 +32255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32169,5 +32263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32177,5 +32271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32185,5 +32279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32193,5 +32287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32201,5 +32295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32210,5 +32304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32218,5 +32312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32226,5 +32320,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32234,5 +32328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32241,5 +32335,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32248,5 +32342,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32264,7 +32358,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32274,5 +32368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32282,5 +32376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32290,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32298,5 +32392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32306,5 +32400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32314,5 +32408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32322,5 +32416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32330,5 +32424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32338,5 +32432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32354,5 +32448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32366,5 +32460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32378,5 +32472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32386,5 +32480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32398,5 +32492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32410,6 +32504,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32419,5 +32513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32431,5 +32525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32443,5 +32537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32455,5 +32549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32467,5 +32561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32479,5 +32573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32487,7 +32581,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32497,5 +32591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32505,5 +32599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32513,5 +32607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32521,5 +32615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32536,5 +32630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32547,5 +32641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32559,5 +32653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32571,5 +32665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32583,5 +32677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32592,5 +32686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32600,5 +32694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32608,5 +32702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32616,5 +32710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32624,5 +32718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32639,5 +32733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32651,5 +32745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32663,5 +32757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32675,5 +32769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32687,5 +32781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32700,5 +32794,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?
@@ -32724,5 +32818,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32733,11 +32827,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32747,5 +32841,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32755,5 +32849,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32763,5 +32857,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32771,5 +32865,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32779,5 +32873,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32787,5 +32881,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32795,5 +32889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32803,5 +32897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32811,5 +32905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32819,5 +32913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32827,5 +32921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32835,5 +32929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32853,5 +32947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32946,5 +33040,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32952,28 +33046,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
@@ -33088,5 +33182,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33099,5 +33193,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>
@@ -33122,6 +33216,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33130,6 +33224,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33144,6 +33238,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
@@ -33157,6 +33251,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
@@ -33176,6 +33270,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33199,6 +33293,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
@@ -33232,4 +33326,5 @@
 #~ msgstr "Load Selection"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contact {0}..."
@@ -33250,7 +33345,9 @@
 #~ 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}"
@@ -33259,10 +33356,13 @@
 #~ 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"
@@ -33271,4 +33371,5 @@
 #~ msgstr "timezone difference: "
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} within the track."
@@ -33277,7 +33378,9 @@
 #~ 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}\"."
@@ -33342,4 +33445,5 @@
 #~ msgstr "to"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Resolve {0} conflicts in {1} objects"
@@ -33351,4 +33455,5 @@
 #~ msgstr "unnamed"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Cannot open preferences directory: {0}"
@@ -33359,4 +33464,5 @@
 #~ msgstr[1] "images"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33371,20 +33477,19 @@
 
 #~ 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."
-
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
+
+#, java-format
 #~ 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"
 
@@ -33392,4 +33497,5 @@
 #~ msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin not found: {0}."
@@ -33439,4 +33545,5 @@
 #~ msgstr "<nd> has zero ref"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin requires JOSM update: {0}."
@@ -33467,7 +33574,9 @@
 #~ 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}''"
@@ -33497,4 +33606,5 @@
 #~ msgstr "Read GPX..."
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Please report a ticket at {0}"
@@ -33521,4 +33631,5 @@
 #~ 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"
@@ -33544,4 +33655,7 @@
 #~ msgstr "Enable proxy server"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Create non-audio markers when reading GPX."
+
 #~ msgid "Proxy server port"
 #~ msgstr "Proxy server port"
@@ -33557,9 +33671,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."
@@ -33569,4 +33683,5 @@
 #~ msgstr "Open file (as raw gps, if .gpx)"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33578,4 +33693,5 @@
 #~ " {0}"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -33583,4 +33699,5 @@
 #~ 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}"
@@ -33593,11 +33710,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"
@@ -33610,4 +33727,5 @@
 #~ msgstr "EPSG:4326"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Error while loading page {0}"
@@ -33620,9 +33738,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?"
@@ -33636,9 +33754,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."
@@ -33646,9 +33764,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?"
@@ -33727,4 +33845,5 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -33829,14 +33948,12 @@
 #~ msgstr "YAHOO (WebKit GTK+)"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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"
@@ -33850,9 +33967,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 ""
@@ -33863,13 +33980,15 @@
 #~ "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 "
@@ -33886,6 +34005,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"
@@ -33894,6 +34013,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 "
@@ -33904,14 +34023,13 @@
 #~ "\n"
 #~ "Full WMS URL input format example (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
-#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/"
-#~ "jpeg\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style"
+#~ "s=&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&Version=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&V"
+#~ "ersion=1.1.0&Request=GetMap&\n"
 #~ "format=image/png"
 
@@ -33925,22 +34043,29 @@
 #~ 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 "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."
@@ -33979,4 +34104,5 @@
 #~ "Are you really sure to continue?"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33992,14 +34118,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 "
@@ -34013,7 +34139,9 @@
 #~ "{0}"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Authors: {0}"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Layers: {0}"
@@ -34022,4 +34150,5 @@
 #~ msgstr "History of Element"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Command Stack: {0}"
@@ -34032,13 +34161,12 @@
 
 #~ 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"
@@ -34055,6 +34183,5 @@
 
 #~ 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"
@@ -34070,8 +34197,7 @@
 #~ msgstr "Auto-tag source added:"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
 #~ msgid "Remove Selected"
@@ -34102,4 +34228,5 @@
 #~ msgstr "Move Down"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relation Editor: {0}"
@@ -34118,4 +34245,5 @@
 #~ "elements have a history."
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Change the projection to {0} first."
@@ -34124,4 +34252,5 @@
 #~ msgstr "Invalid projection"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34131,4 +34260,5 @@
 #~ "continue?"
 
+#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Found {0} matches of {1} in GPX track {2}"
@@ -34137,4 +34267,5 @@
 #~ 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"
@@ -34168,9 +34299,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 ""
-#~ "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"
+#~ msgstr "Errors during Download"
 
 #~ msgid "Board Type"
@@ -34191,16 +34323,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."
@@ -34209,6 +34341,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 "
@@ -34229,9 +34361,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"
@@ -34241,4 +34373,5 @@
 #~ msgstr "Version number missing from OSM data"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34262,4 +34395,5 @@
 #~ 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."
@@ -34271,7 +34405,9 @@
 #~ 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}"
@@ -34280,4 +34416,5 @@
 #~ msgstr "Wrong number of parameters for nodes operator."
 
+#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -34287,4 +34424,5 @@
 #~ "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."
@@ -34309,4 +34447,5 @@
 #~ msgstr "Apply partial resolutions"
 
+#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Plugin {0} requires JOSM update to version {1}."
@@ -34318,18 +34457,17 @@
 #~ 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 ""
@@ -34346,4 +34484,5 @@
 #~ "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 ..."
@@ -34358,15 +34497,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"
@@ -34385,4 +34524,5 @@
 #~ msgstr "Upload to OSM API failed"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34422,6 +34562,5 @@
 
 #~ 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."
@@ -34432,6 +34571,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 "
@@ -34447,6 +34586,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"
@@ -34455,6 +34594,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 "
@@ -34470,6 +34609,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"
@@ -34478,4 +34617,5 @@
 #~ "use."
 
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -34484,4 +34624,5 @@
 #~ msgstr "Failed to initialise API. Please try again later."
 
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -34491,4 +34632,5 @@
 #~ "primitives only"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -34498,17 +34640,19 @@
 #~ "{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}"
@@ -34520,7 +34664,12 @@
 #~ 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!"
+
 #~ msgid "Add a new XML source to the list."
 #~ 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."
@@ -34539,9 +34688,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."
@@ -34551,4 +34700,5 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
@@ -34563,14 +34713,16 @@
 #~ "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?"
@@ -34584,4 +34736,5 @@
 #~ msgstr "Delete all"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
@@ -34589,7 +34742,9 @@
 #~ "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}"
@@ -34597,23 +34752,24 @@
 #~ "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}"
-
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {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>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}"
@@ -34621,7 +34777,9 @@
 #~ "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. "
@@ -34634,4 +34792,5 @@
 #~ 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."
@@ -34642,4 +34801,5 @@
 #~ 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."
@@ -34657,4 +34817,5 @@
 #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -34667,4 +34828,5 @@
 #~ msgstr "Always move and don't show dialogue again"
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -34676,4 +34838,5 @@
 #~ "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 "
@@ -34683,29 +34846,32 @@
 #~ "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>."
@@ -34713,22 +34879,27 @@
 
 #~ 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>."
-
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
+
+#, java-format
 #~ 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}''"
@@ -34740,4 +34911,5 @@
 #~ 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}"
@@ -34749,19 +34921,25 @@
 #~ 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}"
@@ -34770,23 +34948,27 @@
 #~ 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}''"
-
+#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+
+#, java-format
 #~ 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"
@@ -34803,7 +34985,12 @@
 #~ msgstr "No type found. History is empty."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' must not be null"
 
+#~ msgid "Apply also for children"
+#~ msgstr "Apply also for children"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -34822,10 +35009,13 @@
 #~ "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}"
@@ -34834,16 +35024,23 @@
 #~ 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"
-
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+#~ "or range, for example tags:1 or tags:2-5"
+
+#, java-format
 #~ 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."
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
 
 #~ msgid "Enter a changset id"
@@ -34862,58 +35059,64 @@
 #~ "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>"
-
+#~ "<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
 #~ 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}"
-
+#~ "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
+#~ "was: {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 ""
 #~ "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}''."
+
+#, 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 ""
 #~ "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>"
+
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Uploading {0} objects ..."
@@ -34922,11 +35125,13 @@
 #~ 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}"
-
+#~ "Warning: ignoring changeset id {0} for new object with external id {1} and "
+#~ "internal id {2}"
+
+#, java-format
 #~ msgid ""
 #~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
@@ -34950,4 +35155,5 @@
 #~ 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"
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/es.po	(revision 21603)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:22+0000\n"
-"Last-Translator: cdavila <cdavilam@jemila.jazztel.es>\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-06 18:50+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <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-02 08:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -265,6 +265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -319,6 +319,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>"
@@ -343,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
@@ -436,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -651,12 +651,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1306,7 +1306,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
@@ -1355,6 +1355,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
@@ -1485,5 +1485,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1504,5 +1505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1654,5 +1655,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Mostrar informe de situación con información útil que se puede asociar a los "
@@ -1676,5 +1678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1886,5 +1888,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nodo usado por más de una vía y una de esas vías, o"
 
@@ -1954,9 +1957,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)"
@@ -1973,5 +1976,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2037,6 +2040,6 @@
 "''{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
@@ -2272,6 +2275,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "Errores durante la descarga"
 
@@ -2306,7 +2309,7 @@
 msgstr "({0}/{1}) Cargando padres de la relación {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Errores durante la descarga"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2442,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 ""
 "Desplace la flecha de reproducción y suéltela cerca de la traza para "
@@ -2572,68 +2575,70 @@
 msgstr "<final-del-archivo>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Buscar ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Búsqueda de objetos."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Por favor, introduce una cadena de caracteres como filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Por favor, introduzca una cadena de búsqueda."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Introduzca la expresión de búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "añadir a la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "eliminar de la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "encontrar en la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "distinguir mayúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>Calle Mayor</b> - ''Calle'' y ''Mayor'' en cualquier clave o valor."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr ""
+"<b>Calle Mayor</b> - ''Calle'' y ''Mayor'' en cualquier clave o valor."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"Calle Mayor\"</b> - ''Calle Mayor'' en cualquier clave o nombre."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgstr ""
+"<b>\"Calle Mayor\"</b> - ''Calle Mayor'' en cualquier clave o nombre."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:May</b> - ''May'' en cualquier parte del nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - clave ''type'' con el valor exacto ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2643,21 +2648,21 @@
 "<b>*=valor</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:May</b> - sin ''May'' en el nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>¿sentido único?</b> - oneway=yes, true, 1 o on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - cualquier valor presente en clave=foot"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Búsquedas especiales:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2666,19 +2671,20 @@
 "<b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 "<b>user:</b>... - todos los objetos modificados por un determinado usuario"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>usuario:anónimo</b> - todos los objetos modificados por usuarios anónimos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objecto con el ID indicado (0 para los objetos nuevos)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgstr ""
+"<b>id:</b>... - objecto con el ID indicado (0 para los objetos nuevos)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2688,5 +2694,5 @@
 "asignada)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2696,21 +2702,25 @@
 "cambios dado (0 objetos sin un conjunto de cambios asignado)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<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:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+"<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:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
 "max)"
 msgstr ""
-"<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:196
+"<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:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2720,21 +2730,21 @@
 "(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos los objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos los objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos los objetos sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2743,5 +2753,5 @@
 "la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2750,5 +2760,5 @@
 "cumplan la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2756,5 +2766,5 @@
 "lógico O (disyunción)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2762,5 +2772,5 @@
 "contiene <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2770,11 +2780,11 @@
 "escapados precediéndolos con <b>\\</b> (p. ej. <b>\\\"</b> y <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> y <b>)</b> para agrupar expresiones"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2782,38 +2792,38 @@
 msgstr "Filtrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Enviar filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Iniciar búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No se encontraron coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "No se ha quitado nada de la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "No se ha encontrado nada en la selección buscando por ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2821,5 +2831,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2827,5 +2837,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2833,5 +2843,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2850,5 +2860,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2856,10 +2874,5 @@
 "de uso: clave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, 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!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2868,36 +2881,36 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Elemento no esperado. Se esperaba {0} pero se encontró {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autentificación inexperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Falta un parámetro para el 'OR'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Falta un para para el 'NOT'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Se esparaba la primitiva id."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Se esperaba un rango de números"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Se esperaba un conjunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Se esperaba una versión"
@@ -2944,7 +2957,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
@@ -2968,5 +2981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3079,6 +3092,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
@@ -3181,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 ""
 "Está a punto de borrar nodos fuera del área que se ha descargado.<br>Esto "
@@ -3464,6 +3477,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 "
@@ -3483,5 +3496,6 @@
 #, 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
@@ -3560,5 +3574,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3567,5 +3581,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3574,5 +3588,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3611,5 +3625,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3668,5 +3682,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3674,5 +3688,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3680,17 +3694,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Texto"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3698,5 +3706,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3705,5 +3713,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3711,5 +3719,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3717,5 +3725,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3723,43 +3731,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos ocultos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Cierre el diálogo de filtrado para ver todos los objetos.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Se esperaba una versión > 0. Encontrada {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3770,5 +3778,5 @@
 "changesetId es {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3778,5 +3786,5 @@
 "es nueva y la otra no."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3836,5 +3844,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "No se puede comparar la primitiva con ID \"{0}\" con la primitiva con ID "
@@ -3846,81 +3855,81 @@
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Vía de tipo área sin cerrar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Se ha encontrado más de una vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Función ''{0}'' desconocida."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "No se ha encontrado el estilo para la restricción {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3996,6 +4005,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
@@ -4096,8 +4105,9 @@
 #: ../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
@@ -4167,5 +4177,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4175,5 +4185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4182,5 +4192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4189,5 +4199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4196,5 +4206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4203,5 +4213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4210,9 +4220,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4530,5 +4540,6 @@
 #, 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:168
@@ -4537,6 +4548,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4551,4 +4562,5 @@
 msgstr "Editar"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4652,6 +4664,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:298
@@ -4702,6 +4714,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
@@ -4752,5 +4764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4795,11 +4807,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
@@ -4830,5 +4842,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 +4849,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 +4856,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"
@@ -5078,5 +5090,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar sus elementos seleccionados al final de la lista de elementos "
@@ -5107,6 +5120,7 @@
 msgstr "Copiar todos sus elementos al destino"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5118,5 +5132,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Bajar"
@@ -5162,6 +5176,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 "
@@ -5171,6 +5185,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 "
@@ -5225,6 +5239,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: "
@@ -5464,6 +5478,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5476,6 +5490,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5720,6 +5734,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5793,11 +5807,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
@@ -5822,5 +5836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 "Descarga información sobre las modificaciones seleccionadas desde el "
@@ -5840,6 +5855,5 @@
 msgstr "Abre una página web para cada modificacion seleccionada"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5849,5 +5863,6 @@
 #: ../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
@@ -5863,5 +5878,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5869,5 +5884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5945,9 +5960,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5965,13 +5981,13 @@
 msgstr "Resolver los conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtra objetos y los oculta/visualiza."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5980,45 +5996,41 @@
 msgstr "Añadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Añadir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Borrar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Subir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Bajar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Activar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Ocultar elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Aplicar también a los niños"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Invertir filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Modo de filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6177,9 +6189,11 @@
 #: ../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
@@ -6246,10 +6260,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Seleccionar en la lista de relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Seleccionar relación en la lista de relaciones."
@@ -6428,5 +6442,6 @@
 #: ../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
@@ -6500,5 +6515,6 @@
 #, 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
@@ -6542,5 +6558,6 @@
 #: ../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
@@ -6554,6 +6571,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 "
@@ -6609,4 +6626,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7752,9 +7770,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
@@ -7764,6 +7782,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
@@ -7779,8 +7797,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 ""
 
@@ -7903,5 +7921,5 @@
 msgstr "La URL de consulta de modificaciones no es válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7910,23 +7928,23 @@
 msgstr[1] "Se modificarán {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Un valor vacío borra el atributo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7935,5 +7953,5 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7942,78 +7960,82 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor, seleccione los objetos a los que desea cambiar las propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Seleccionar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Seleccionar la relación en la selección principal."
@@ -8128,11 +8150,12 @@
 #: ../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 ""
 
@@ -8150,6 +8173,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 ""
 
@@ -8304,5 +8327,6 @@
 #: ../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
@@ -8325,6 +8349,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 "<html>La capa ''{0}'' tiene un conflicto con la primitiva <br>''{1}''.<br>Es "
@@ -8541,5 +8566,6 @@
 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
@@ -8673,6 +8699,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8732,4 +8759,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8812,6 +8840,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 ""
 
@@ -8821,6 +8849,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 ""
 
@@ -9094,17 +9122,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>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
@@ -9118,13 +9147,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9136,7 +9166,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
@@ -9375,5 +9405,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9390,5 +9420,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9473,6 +9504,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] ""
@@ -9486,6 +9517,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 "
@@ -9717,5 +9748,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9743,5 +9774,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 "El set de cambios va a <strong>cerrarse</strong> después de esta subida"
@@ -9763,6 +9795,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
@@ -9775,9 +9807,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
@@ -9787,6 +9819,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
@@ -9806,6 +9838,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 "
@@ -9862,7 +9894,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 ""
 
@@ -9872,5 +9904,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9895,5 +9927,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Se ignora la excepción capturada debido a que se ha cancelado la subida. La "
@@ -10114,7 +10147,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 ""
 
@@ -10140,7 +10173,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 ""
 
@@ -10204,6 +10237,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>La subida de datos gps sin procesar como datos de mapa se considera "
@@ -10219,5 +10252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10270,6 +10303,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:1126
@@ -10392,6 +10425,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 ""
 
@@ -10451,11 +10484,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
@@ -10521,64 +10554,68 @@
 msgstr "Estimación automática"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Ajuste manual"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Imágenes con geolocalización en datos exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Mostrar imágenes en miniatura en el mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Ajuste:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Correlacionar las imágenes con la traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correlación"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Zona horaria no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Desplazamiento inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Volver a intentar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10588,20 +10625,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zona horaria: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Segundos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10610,5 +10647,5 @@
 msgstr[1] "(Diferencia de tiempo de {0} días)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10619,13 +10656,13 @@
 "manual."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Ajuste de fotografías a traza fallido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Ajustar zona horaria y la diferencia temporal"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
@@ -10633,9 +10670,9 @@
 "fueron tomadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Las fotografías no contiene información horaria"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10645,17 +10682,17 @@
 "seleccione otra."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "La traza GPX no posee información horaria"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Debe seleccionar una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "No se ha seleccionado una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10666,5 +10703,5 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10717,14 +10754,14 @@
 msgstr "Error mientras se obtenían archivos del directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10733,5 +10770,5 @@
 msgstr[1] "{0} imágenes cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10740,10 +10777,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Borrar archivo de imagen del disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10752,5 +10789,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "El archivo de imagen no se pudo borrar."
@@ -10935,5 +10972,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "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
@@ -11046,6 +11084,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 ""
 
@@ -11067,8 +11105,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> "
@@ -11194,6 +11232,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 ""
 
@@ -11304,5 +11342,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11436,8 +11475,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 ""
 
@@ -11520,8 +11559,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 ""
 
@@ -11548,7 +11587,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 ""
 
@@ -11622,37 +11661,33 @@
 msgstr "Mostrar traza de audio en vivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Crear marcadores no de audio al leer gpx"
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Nodos de vía explícitos con marcas de tiempo válidas"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with time estimated from track position."
+msgstr ""
+"Nodos de vía explícitos con el tiempo estimado desde la posición de la traza"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Nodos de vía explícitos con el tiempo estimado desde la posición de la traza"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Puntos de traza nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Modificado el registro temporal de los archivos de audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 "Salida de traza (siempre hará esto si no hay otros marcadores disponibles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 "Mostrar u ocultar la entrada del menú audio de la barra de menú principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11662,5 +11697,5 @@
 "sincronizada donde el audio que se escucha fue grabado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11670,23 +11705,15 @@
 "iconos de botón"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Crear capa de marcadores automáticamente desde los nodos de vía al abrir una "
-"capa gpx."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Al importar audio, crear marcadores desde..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Al importar audio, aplicar a cualquier nodo de vía en la capa gpx."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11696,5 +11723,5 @@
 "de desde los nodos de vía explícitos) con nombres y descripciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11704,5 +11731,5 @@
 "fecha modificada de cada archivo importado de audio WAV."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11712,18 +11739,18 @@
 "botón pertinente es pulsado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Avanzar/retroceder tiempo (segundos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 "La cantidad por la que es multiplicada la velocidad para el avance rápido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Multiplicador de avance rápido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11733,9 +11760,9 @@
 "negativo) la pista de audio solicitada"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Tiempo introductorio (segundos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
@@ -11743,5 +11770,5 @@
 "en realidad."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Calibración del grabador de voz"
@@ -11781,5 +11808,5 @@
 msgstr "Colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11790,30 +11817,30 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Archivos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Ninguno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Forzar lineas si no hay segmentos importados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Dibujar más grandes los puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Dibujar el valor HDOP de forma circular"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -11821,5 +11848,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -11827,5 +11854,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11847,5 +11874,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11887,5 +11914,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11899,50 +11926,62 @@
 msgstr "Pie"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Crear capa de marcadores automáticamente desde los nodos de vía al abrir una "
+"capa gpx."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11952,9 +11991,9 @@
 "Valor ''-1'' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11963,10 +12002,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11975,11 +12014,12 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Dibujar flechas de dirección usando visualizaciones de tablas en vez de "
@@ -11987,5 +12027,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11994,13 +12034,13 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12010,9 +12050,9 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12020,5 +12060,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12026,24 +12066,25 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Aplicar antialias a la vista del mapa da como resultado una apariencia más "
@@ -12051,10 +12092,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12063,9 +12104,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -12137,5 +12178,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12184,6 +12226,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Actualizar complementos"
@@ -12213,5 +12255,6 @@
 #: ../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
@@ -12260,6 +12303,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 ""
 
@@ -12272,9 +12315,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 ""
 
@@ -12574,6 +12617,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 ""
 
@@ -12699,6 +12742,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 ""
 
@@ -12720,6 +12763,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 ""
 
@@ -12801,5 +12844,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12815,5 +12859,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12910,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 ""
 
@@ -13208,5 +13253,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
@@ -13393,5 +13438,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13507,5 +13553,6 @@
 #, 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
@@ -13786,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 ""
 
@@ -13813,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 ""
 
@@ -13854,5 +13901,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -14288,14 +14336,20 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14304,24 +14358,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Cargando componentes..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Comprobando requisitos previos del componente..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Cargando componente ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14331,5 +14379,5 @@
 "JOSM no ha podido encontrar información sobre los componentes siguientes:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14337,17 +14385,17 @@
 msgstr[1] "Los componentes no serán cargados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Determinar los componentes a cargar ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Eliminando componentes obsoletos..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14355,5 +14403,5 @@
 msgstr[1] "La actualización de los siguientes componentes ha fallado:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14365,42 +14413,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Actualización del componente fallida"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Deshabilitar complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Mantener componente"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Advertencia: falló la eliminación del componente obsoleto ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14409,5 +14457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14416,23 +14464,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Sucedió una excepción imprevista. Pudo ser originada por el componente "
+"\"{0}\"."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Sucedió una excepción imprevista. Pudo ser originada por el componente \"{0}"
-"\"."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acuerdo a la información del componente, el autor es {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14441,9 +14489,9 @@
 "informar del error."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "¿Se debe deshabilitar el complemento?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14453,14 +14501,14 @@
 "JOSM para descargarle del programa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Información del complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "no hay descripción disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14503,5 +14551,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14564,5 +14613,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"
@@ -14623,6 +14672,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>"
 
@@ -14643,8 +14692,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
@@ -14652,17 +14701,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 ""
 
@@ -14670,7 +14719,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 ""
 
@@ -14678,8 +14727,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 ""
 
@@ -14699,7 +14748,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 ""
 
@@ -14781,10 +14830,11 @@
 #, 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
@@ -14795,7 +14845,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 "
@@ -14830,9 +14880,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14893,6 +14943,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"
@@ -15518,7 +15568,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15528,5 +15578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15536,5 +15586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15550,5 +15600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15558,5 +15608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15587,5 +15637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15594,5 +15644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15601,5 +15651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15608,5 +15658,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15615,5 +15665,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15622,5 +15672,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15654,17 +15704,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 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.html\"> 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.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."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16158,34 +16210,35 @@
 msgstr "Error en la zona Lambert  de la caché"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Uso"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Por favor, seleccione un esquema para ser utilizado"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Esquema de color"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Por favor, seleccione el esquema que quiere eliminar"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Utilizar el esquema seleccionado de la lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Utilizar los colores actuales como un nuevo esquema de color."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Eliminar el esquema seleccionado de la lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Esquemas de color"
@@ -16261,5 +16314,5 @@
 msgstr "Capa para la edición de trazas GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir a capa GPX con tiempo anonimizado"
@@ -16350,4 +16403,5 @@
 msgstr "Puerto:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16413,6 +16467,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
@@ -16560,5 +16614,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16679,5 +16733,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250."
@@ -16701,6 +16756,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Precisión en la simplificación de línea Douglas-Peucker, medido en grados. "
@@ -16725,5 +16781,6 @@
 #: ../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
@@ -16916,5 +16973,6 @@
 #: ../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
@@ -16996,7 +17054,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
@@ -17023,5 +17081,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "La cabecera contiene varios valores y no puede ser transferida a una sola "
@@ -17096,6 +17155,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
@@ -17137,5 +17196,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -17188,5 +17248,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -18013,4 +18074,12 @@
 msgstr "Edificios entre medianeras"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18307,5 +18376,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14
 msgid "No Straight On"
-msgstr ""
+msgstr "Prohibido seguir de frente"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15
@@ -18336,5 +18405,5 @@
 msgstr ""
 "Seleccione los tipos de vehículos a los que es restricción de giro "
-"<strong>no</ strong>  es aplicable."
+"<strong>no</strong>  es aplicable."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
@@ -18465,6 +18534,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 "
@@ -18561,8 +18630,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 ""
 
@@ -18616,8 +18685,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 ""
 
@@ -18731,6 +18800,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 ""
 
@@ -18738,6 +18807,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 ""
 
@@ -19397,6 +19466,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"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 "
@@ -19548,5 +19618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19653,5 +19723,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19665,6 +19735,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
@@ -20001,6 +20071,6 @@
 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"
@@ -20058,9 +20128,6 @@
 msgstr "Archivos WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20071,10 +20138,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "La base de datos está fuera de línea por mantenimiento"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20084,25 +20151,25 @@
 "Solicite un área más pequeña o utilice el archivo planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "No es posible obtener un flujo de audio desde la URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Dispositivo de audio no disponible"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Debe hacer públicas sus ediciones para subir nuevos datos"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20110,17 +20177,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "plantación forestal"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20128,7 +20195,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20138,5 +20205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20179,5 +20246,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20187,5 +20254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20195,5 +20262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20203,8 +20270,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20218,5 +20285,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20227,5 +20294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20234,7 +20301,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20244,5 +20311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20252,5 +20319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20260,5 +20327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20268,5 +20335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20276,5 +20343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20284,5 +20351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20292,8 +20359,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20303,59 +20370,60 @@
 msgstr "ruta"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Atributos opcionales"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Modificadores:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nombre de archivo"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Escalera de paso"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Tipos de combustible:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Página principal"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoista"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Ampliar"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Función nueva"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Crear un nodo nuevo."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Guardar"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20440,5 +20508,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Descargar puntos GPS desde el registrador de datos GlobalSat DG100 "
@@ -20448,5 +20517,6 @@
 #: build/trans_plugins.java:25
 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
@@ -20641,6 +20711,13 @@
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20649,5 +20726,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20656,10 +20733,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20671,5 +20748,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20679,5 +20756,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20688,5 +20765,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -20694,10 +20771,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20706,5 +20783,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21596,7 +21673,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21736,8 +21813,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"/>
@@ -21947,5 +22024,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21955,5 +22032,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21972,5 +22049,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21980,5 +22057,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21997,5 +22074,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22005,5 +22082,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22022,5 +22099,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22030,5 +22107,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22043,5 +22120,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22059,5 +22136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22075,5 +22152,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22082,5 +22159,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22090,5 +22167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22108,5 +22185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22115,5 +22192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22123,5 +22200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22825,5 +22902,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22874,5 +22951,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22970,5 +23047,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23136,5 +23213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23468,5 +23545,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23476,5 +23553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23484,5 +23561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23492,5 +23569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23500,5 +23577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23508,5 +23585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23516,5 +23593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23525,5 +23602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24943,5 +25020,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24951,5 +25028,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24959,5 +25036,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24967,5 +25044,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25329,7 +25406,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25339,5 +25416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25347,5 +25424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25355,5 +25432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25363,5 +25440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25371,5 +25448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25379,5 +25456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25387,5 +25464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25395,5 +25472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25403,5 +25480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25411,5 +25488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25419,5 +25496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25427,5 +25504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25435,5 +25512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25443,5 +25520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25451,5 +25528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25459,5 +25536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25467,5 +25544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25475,5 +25552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25483,5 +25560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25491,5 +25568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25499,5 +25576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25507,5 +25584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25515,5 +25592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25523,5 +25600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25531,5 +25608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25539,5 +25616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25547,5 +25624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25555,5 +25632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25563,5 +25640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25571,5 +25648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25579,5 +25656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25587,5 +25664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25595,5 +25672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25603,5 +25680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25611,5 +25688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25619,5 +25696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25627,5 +25704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25635,5 +25712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25643,5 +25720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25651,5 +25728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25659,5 +25736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25667,5 +25744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25675,5 +25752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25683,5 +25760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25691,5 +25768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25699,5 +25776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27403,7 +27480,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27413,5 +27490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27421,5 +27498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27429,5 +27506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27437,5 +27514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27445,5 +27522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27453,5 +27530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27461,5 +27538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27469,5 +27546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28900,5 +28977,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28914,5 +28991,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28922,5 +28999,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28931,5 +29008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28942,7 +29019,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28952,5 +29029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28960,5 +29037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28968,5 +29045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28976,5 +29053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29008,5 +29085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29022,5 +29099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29030,5 +29107,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29037,5 +29114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29045,5 +29122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29054,5 +29131,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29077,5 +29154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29190,9 +29267,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
@@ -29200,5 +29277,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,
@@ -29208,8 +29285,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
@@ -29223,5 +29300,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29229,5 +29306,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29276,6 +29353,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>
@@ -29355,5 +29432,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29363,11 +29440,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29383,5 +29460,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29390,5 +29467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29397,5 +29474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29411,5 +29488,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29423,5 +29500,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29430,5 +29507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29437,5 +29514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29444,5 +29521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29451,5 +29528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29458,5 +29535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29465,5 +29542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29472,5 +29549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29479,5 +29556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29486,5 +29563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29493,5 +29570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29500,5 +29577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29507,5 +29584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29514,5 +29591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29521,5 +29598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29696,7 +29773,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29710,5 +29787,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29718,7 +29795,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29728,5 +29805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29736,5 +29813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29744,5 +29821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29752,5 +29829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29766,5 +29843,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29773,5 +29850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29781,5 +29858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29788,5 +29865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29795,5 +29872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29802,5 +29879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29809,5 +29886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29816,5 +29893,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29823,5 +29900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29830,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29837,5 +29914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29844,5 +29921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29856,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29868,5 +29945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29875,5 +29952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29887,5 +29964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29900,5 +29977,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29913,5 +29990,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29925,5 +30002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29937,5 +30014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29944,5 +30021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29951,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29959,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29966,5 +30043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29973,5 +30050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29980,5 +30057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29988,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29997,5 +30074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30005,7 +30082,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30015,5 +30092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30023,5 +30100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30031,5 +30108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30040,5 +30117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30047,5 +30124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30055,5 +30132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30063,5 +30140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30071,5 +30148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30079,5 +30156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30087,5 +30164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30095,5 +30172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30103,5 +30180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30111,5 +30188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30119,5 +30196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30140,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30153,7 +30230,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30163,5 +30240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30170,5 +30247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30178,5 +30255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30185,5 +30262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30193,5 +30270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30201,5 +30278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30215,5 +30292,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30224,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30241,5 +30318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30249,5 +30326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30260,5 +30337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30277,5 +30354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30284,5 +30361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30291,5 +30368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30298,7 +30375,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30309,5 +30386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30322,5 +30399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30334,5 +30411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30342,5 +30419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30354,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30366,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30373,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30380,7 +30457,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30390,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30398,5 +30475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30406,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30414,5 +30491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30422,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30436,7 +30513,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30451,5 +30528,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30464,5 +30541,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30477,5 +30554,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30490,5 +30567,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30503,5 +30580,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30516,7 +30593,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30526,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30533,5 +30610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30541,5 +30618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30549,5 +30626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30557,5 +30634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30565,5 +30642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30573,5 +30650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30581,5 +30658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30589,5 +30666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30597,5 +30674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30605,5 +30682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30613,5 +30690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30621,5 +30698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30639,5 +30716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30652,5 +30729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30663,7 +30740,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30673,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30681,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30689,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30697,5 +30774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30705,5 +30782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30713,5 +30790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30721,5 +30798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30729,5 +30806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30737,5 +30814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30745,5 +30822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30753,5 +30830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30761,5 +30838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30769,5 +30846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30777,5 +30854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30785,5 +30862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30793,5 +30870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30813,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30825,7 +30902,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30835,5 +30912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30843,5 +30920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30851,5 +30928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30859,5 +30936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30867,5 +30944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30875,5 +30952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30883,5 +30960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30891,5 +30968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30899,5 +30976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30907,5 +30984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30924,5 +31001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30932,5 +31009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30940,5 +31017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30948,5 +31025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30956,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30964,5 +31041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30972,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30980,5 +31057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30988,5 +31065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30996,5 +31073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31004,5 +31081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31012,5 +31089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31029,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31036,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31044,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31051,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31059,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31067,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31075,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31082,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31090,5 +31167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31098,5 +31175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31106,5 +31183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31114,5 +31191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31121,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31128,5 +31205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31135,5 +31212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31142,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31149,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31156,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31163,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31170,5 +31247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31177,5 +31254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31184,5 +31261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31191,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31198,5 +31275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31205,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31213,5 +31290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31221,5 +31298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31229,5 +31306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31237,5 +31314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31245,5 +31322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31253,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31261,5 +31338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31269,5 +31346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31277,5 +31354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31286,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31294,5 +31371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31302,5 +31379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31310,5 +31387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31318,5 +31395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31326,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31334,5 +31411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31342,5 +31419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31350,5 +31427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31358,5 +31435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31366,5 +31443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31374,5 +31451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31382,5 +31459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31390,5 +31467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31398,5 +31475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31406,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31414,5 +31491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31422,5 +31499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31430,5 +31507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31438,5 +31515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31445,5 +31522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31475,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31483,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31491,7 +31568,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31506,5 +31583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31514,5 +31591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31522,5 +31599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31530,5 +31607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31538,5 +31615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31546,5 +31623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31554,5 +31631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31568,7 +31645,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31578,5 +31655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31586,5 +31663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31594,5 +31671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31602,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31610,5 +31687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31618,5 +31695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31626,5 +31703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31634,5 +31711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31642,5 +31719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31650,5 +31727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31658,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31666,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31674,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31682,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31690,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31698,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31706,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31714,5 +31791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31722,5 +31799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31730,5 +31807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31738,5 +31815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31746,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31754,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31762,5 +31839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31770,5 +31847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31778,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31786,5 +31863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31794,5 +31871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31802,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31810,5 +31887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31818,5 +31895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31826,5 +31903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31834,5 +31911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31842,5 +31919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31850,5 +31927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31858,5 +31935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31866,5 +31943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31874,5 +31951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31882,5 +31959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31890,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31898,5 +31975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31906,5 +31983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31940,7 +32017,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31950,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31958,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31966,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31974,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31982,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31990,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31998,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32013,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32021,5 +32098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32029,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32037,5 +32114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32045,5 +32122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32053,5 +32130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32062,5 +32139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32070,5 +32147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32078,5 +32155,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32086,5 +32163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32093,5 +32170,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32100,5 +32177,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32116,7 +32193,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32126,5 +32203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32134,5 +32211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32142,5 +32219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32150,5 +32227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32158,5 +32235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32166,5 +32243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32174,5 +32251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32182,5 +32259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32190,5 +32267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32206,5 +32283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32218,5 +32295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32230,5 +32307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32238,5 +32315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32250,5 +32327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32262,6 +32339,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32271,5 +32348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32283,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32295,5 +32372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32307,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32319,5 +32396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32331,5 +32408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32339,7 +32416,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32349,5 +32426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32357,5 +32434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32365,5 +32442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32373,5 +32450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32388,5 +32465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32399,5 +32476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32411,5 +32488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32423,5 +32500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32435,5 +32512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32444,5 +32521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32452,5 +32529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32460,5 +32537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32468,5 +32545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32476,5 +32553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32491,5 +32568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32503,5 +32580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32515,5 +32592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32527,5 +32604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32539,5 +32616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32552,5 +32629,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?
@@ -32576,5 +32653,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32585,11 +32662,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32599,5 +32676,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32607,5 +32684,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32615,5 +32692,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32623,5 +32700,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32631,5 +32708,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32639,5 +32716,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32647,5 +32724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32655,5 +32732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32663,5 +32740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32671,5 +32748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32679,5 +32756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32687,5 +32764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32705,5 +32782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32798,5 +32875,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32804,28 +32881,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
@@ -32940,5 +33017,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32951,5 +33028,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>
@@ -32974,6 +33051,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32982,6 +33059,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32996,6 +33073,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
@@ -33009,6 +33086,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
@@ -33028,6 +33105,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33051,6 +33128,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
@@ -33078,4 +33155,5 @@
 #~ msgstr "Correo Electrónico"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contacto {0}..."
@@ -33093,4 +33171,5 @@
 #~ 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}"
@@ -33098,13 +33177,15 @@
 #~ msgid "No images with readable timestamps found."
 #~ msgstr ""
-#~ "No se han encontrado imágenes con metadatos legibles sobre la fecha y "
-#~ "hora."
-
+#~ "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
+
+#, java-format
 #~ 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}"
@@ -33116,7 +33197,9 @@
 #~ 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}"
@@ -33140,6 +33223,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"
@@ -33169,4 +33252,5 @@
 #~ msgstr "diferencia de zona horaria: "
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro de la traza."
@@ -33175,4 +33259,5 @@
 #~ msgstr "Sincronizar reloj"
 
+#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr ""
@@ -33195,4 +33280,5 @@
 #~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
 
+#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "delta actual: {0}s"
@@ -33201,4 +33287,5 @@
 #~ 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}"
@@ -33207,4 +33294,5 @@
 #~ msgstr "Abrir en el navegador"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Complemento no encontrado: {0}."
@@ -33217,4 +33305,5 @@
 #~ "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}."
@@ -33253,7 +33342,9 @@
 #~ 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}''"
@@ -33263,10 +33354,11 @@
 
 #~ 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:"
@@ -33275,6 +33367,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33285,4 +33376,5 @@
 #~ msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33294,9 +33386,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 "
@@ -33306,7 +33398,9 @@
 #~ 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}"
@@ -33373,4 +33467,5 @@
 #~ msgstr "Error analizando la respuesta del servidor"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Por favor presente una \"ticket\" en {0}"
@@ -33380,6 +33475,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 "
@@ -33392,4 +33487,5 @@
 #~ msgstr "Zona horaria del GPS (diferencia con la foto)"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Imágenes para {0}"
@@ -33401,4 +33497,5 @@
 #~ 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"
@@ -33439,4 +33536,7 @@
 #~ msgstr "Puente levadizo"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Crear marcadores no de audio al leer gpx"
+
 #~ msgid "Rotate"
 #~ msgstr "Rotar"
@@ -33452,9 +33552,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"
@@ -33466,6 +33566,5 @@
 #~ 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"
@@ -33524,9 +33623,8 @@
 
 #~ 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"
@@ -33551,20 +33649,18 @@
 #~ "<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..."
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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"
@@ -33603,6 +33699,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 "
@@ -33626,7 +33722,9 @@
 #~ "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}\""
@@ -33662,13 +33760,17 @@
 #~ 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"
@@ -33692,11 +33794,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."
-
+#~ "El complemento {0} parece roto o no se ha podido bajar de forma automática."
+
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33715,4 +33817,5 @@
 #~ msgstr "Subir a OSM..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33721,6 +33824,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}"
@@ -33751,10 +33854,11 @@
 
 #~ msgid "Track Grade 5"
-#~ msgstr ""
-#~ "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
-
+#~ msgstr "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
+
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Capas: {0}"
@@ -33763,4 +33867,5 @@
 #~ msgstr "Histórico del elemento"
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "La vía multipoligonal ''{0}'' no está cerrada."
@@ -33791,4 +33896,5 @@
 #~ 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"
@@ -33803,4 +33909,5 @@
 #~ msgstr "Eliminar seleccionados"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pila de comandos: {0}"
@@ -33827,4 +33934,5 @@
 #~ msgstr "Mueve hacia abajo"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor de relación: {0}"
@@ -33833,4 +33941,5 @@
 #~ msgstr "Mover hacia arriba"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33852,6 +33961,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"
@@ -33861,10 +33970,11 @@
 #~ 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 "
@@ -33881,6 +33991,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"
@@ -33890,6 +34000,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 "
@@ -33904,7 +34014,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 "
@@ -33913,19 +34023,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.\""
-
+#~ "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
 #~ 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}"
@@ -33963,6 +34073,5 @@
 #~ 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"
@@ -33981,4 +34090,5 @@
 #~ 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."
@@ -34012,6 +34122,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 "
@@ -34030,6 +34140,5 @@
 #~ 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)"
@@ -34041,10 +34150,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."
 
@@ -34061,7 +34170,9 @@
 #~ 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"
@@ -34088,13 +34199,15 @@
 #~ 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"
@@ -34113,6 +34226,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 "
@@ -34130,9 +34243,7 @@
 
 #~ 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..."
@@ -34145,8 +34256,9 @@
 #~ 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}\""
-
+#~ msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
+
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34155,6 +34267,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"
@@ -34173,4 +34285,5 @@
 #~ 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}"
@@ -34188,37 +34301,38 @@
 #~ 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>"
-
+#~ "<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
 #~ 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"
@@ -34233,6 +34347,5 @@
 #~ 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"
@@ -34245,17 +34358,21 @@
 #~ msgstr "Capa de datos"
 
+#~ msgid "Errors during Download"
+#~ 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."
@@ -34268,4 +34385,5 @@
 #~ msgstr "WGS84 Geográfico"
 
+#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
@@ -34277,4 +34395,5 @@
 #~ msgstr "Cargar selección"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "eliminando referencia de la vía {0}"
@@ -34282,6 +34401,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"
@@ -34291,4 +34410,5 @@
 #~ msgstr "Conflictos en dato"
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Vía ''{0}''  con menos de dos puntos."
@@ -34301,16 +34421,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?"
-
+#~ "puede causar problemas ya que otros objetos (que no puede ver) pueden estar "
+#~ "usándolos.<br>¿Esta seguro que quiere borrarlo?"
+
+#, java-format
 #~ 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..."
@@ -34327,27 +34447,29 @@
 
 #~ 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"
-
+#~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez {0} "
+#~ "de {1} solo seleccionados primitivos"
+
+#, java-format
 #~ 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}"
-
+#~ "El número de modificaciones actuales supera el máximo de modificaciones, el "
+#~ "actual es {0}, el máximo es {1}"
+
+#, java-format
 #~ 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."
@@ -34357,9 +34479,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"
@@ -34370,19 +34492,20 @@
 
 #~ 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"
@@ -34392,8 +34515,10 @@
 #~ 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?"
@@ -34401,13 +34526,14 @@
 #~ "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 "
@@ -34417,13 +34543,19 @@
 #~ "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
 #~ 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"
@@ -34435,22 +34567,27 @@
 
 #~ 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}\""
@@ -34462,4 +34599,5 @@
 #~ 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 ""
@@ -34473,16 +34611,21 @@
 #~ "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}"
@@ -34491,33 +34634,38 @@
 #~ 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}\""
-
+#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+#~ "\"{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 ""
 #~ "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}"
@@ -34528,20 +34676,26 @@
 #~ 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>"
-
+#~ "<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 "Apply also for children"
+#~ 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}"
@@ -34554,4 +34708,5 @@
 #~ "El componente no puede ser eliminado. Probablemente ya estaba desabilitado"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "El parámetro''{0}'' no debe ser nulo"
@@ -34564,28 +34719,30 @@
 #~ 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."
@@ -34596,7 +34753,9 @@
 #~ 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"
@@ -34605,23 +34764,27 @@
 #~ 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"
-
+#~ "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
 #~ 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, "
@@ -34639,9 +34802,10 @@
 #~ "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."
-
+#~ "<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
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr ""
@@ -34655,8 +34819,9 @@
 #~ "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>"
-
+#~ "<html>Activar para restringir la consulta a las modificaciones "
+#~ "propias.<br>Desactivar para incluir todas las modificaciones en la "
+#~ "consulta.</html>"
+
+#, java-format
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr ""
@@ -34669,6 +34834,10 @@
 #~ 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"
+#~ msgid "C"
+#~ msgstr "C"
 
 #~ msgid "GPS point"
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/et.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:51+0000\n"
+"POT-Creation-Date: 2010-06-07 09:15+0200\n"
+"PO-Revision-Date: 2010-06-02 13:38+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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -260,6 +260,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -430,6 +430,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -643,12 +643,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1438,5 +1438,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1457,5 +1458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1626,5 +1627,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -2209,6 +2210,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "Viga allalaadimisel"
 
@@ -2243,7 +2244,7 @@
 msgstr "({0}/{1}) Relatsiooni {2} vanemate laadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Viga allalaadimisel"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2491,10 +2492,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Otsi..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Otsi objekte."
@@ -2502,57 +2503,57 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Palun sisesta otsingu tekst"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "asenda valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "lisa valikusse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "eemalda valikust"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "tõstutundlik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regulaaravaldis"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
-msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2560,38 +2561,38 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+msgid "<u>Special targets:</u>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
-msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
-msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
-msgid "<b>foot:</b> - key=foot set to any value."
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
-msgid "<u>Special targets:</u>"
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
-msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2599,5 +2600,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2605,5 +2606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2611,5 +2612,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2617,5 +2618,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2623,39 +2628,39 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+msgid "<b>modified</b> - all changed objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgid "<b>selected</b> - all selected objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
-msgid "<b>modified</b> - all changed objects"
+msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
-msgid "<b>selected</b> - all selected objects"
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
-msgid "<b>incomplete</b> - all incomplete objects"
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
-msgid "<b>untagged</b> - all untagged objects"
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2663,11 +2668,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2675,38 +2680,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Otsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Alusta otsingut"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2714,5 +2719,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2720,5 +2725,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2726,5 +2731,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2739,50 +2744,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2846,5 +2854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3444,5 +3452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3495,5 +3503,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3501,5 +3509,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3507,17 +3515,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr ""
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3525,5 +3527,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3532,5 +3534,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3538,5 +3540,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3544,5 +3546,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3550,42 +3552,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3594,5 +3596,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3600,5 +3602,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3662,81 +3664,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4341,6 +4343,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4355,4 +4357,5 @@
 msgstr "Muuda"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4545,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:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4861,6 +4864,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4872,5 +4876,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr ""
@@ -5188,6 +5192,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5200,6 +5204,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5538,6 +5542,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5561,5 +5564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5567,5 +5570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5659,13 +5662,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5674,45 +5677,41 @@
 msgstr "Lisa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5939,10 +5938,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6284,4 +6283,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7539,5 +7539,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7546,23 +7546,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7571,5 +7571,5 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7578,77 +7578,81 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "On liikmeks järgnevas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -8325,4 +8329,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8939,5 +8944,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9759,5 +9764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10045,64 +10050,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10112,20 +10121,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10134,5 +10143,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10140,21 +10149,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10162,17 +10171,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10181,5 +10190,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10230,14 +10239,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10246,5 +10255,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10253,10 +10262,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10265,5 +10274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -11115,34 +11124,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11150,5 +11155,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11156,21 +11161,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11178,5 +11177,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11184,5 +11183,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11190,17 +11189,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11208,13 +11207,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11254,5 +11253,5 @@
 msgstr "Värvid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11263,34 +11262,34 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Force lines if no segments imported."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Force lines if no segments imported."
+msgid "Draw large GPS points."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-msgid "Draw large GPS points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Velocity (red = slow, green = fast)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
-msgid "Velocity (red = slow, green = fast)"
+msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11298,5 +11297,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11318,5 +11317,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11358,5 +11357,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11370,50 +11369,60 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Joonista suuna nooled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+msgid "Only on the head of a way."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
-msgid "Only on the head of a way."
+msgid "Draw segment order numbers"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw segment order numbers"
+msgid "Draw boundaries of downloaded data"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw boundaries of downloaded data"
+msgid "Draw virtual nodes in select mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw virtual nodes in select mode"
+msgid "Draw inactive layers in other color"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw inactive layers in other color"
+msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11421,34 +11430,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11456,13 +11465,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11470,9 +11479,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11480,46 +11489,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr ""
@@ -11638,6 +11647,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Pistikrakenduste uuendamine"
@@ -13709,10 +13718,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13721,23 +13735,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13745,5 +13754,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13751,17 +13760,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13769,5 +13778,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13779,42 +13788,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13823,5 +13832,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13830,30 +13839,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
-#, java-format
-msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13861,14 +13870,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "kirjeldust pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14210,5 +14219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15484,34 +15493,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -15584,5 +15594,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15673,4 +15683,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -17292,4 +17303,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18870,5 +18889,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19243,9 +19262,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19254,10 +19270,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr ""
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19265,25 +19281,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19294,14 +19310,14 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "kultuurmets"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19387,5 +19403,5 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19399,5 +19415,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19476,5 +19492,5 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19484,57 +19500,60 @@
 msgstr "teekond"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Valikulised tunnused:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Uuenda muudetud"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Tegelik nimi"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Joonetüüp"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Koduleht"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Suurenda"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
 msgid "New Folder"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Loo uus sõlm."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Salvesta"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19769,6 +19788,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19777,5 +19803,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19784,10 +19810,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19796,5 +19822,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19804,5 +19830,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19811,15 +19837,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19828,5 +19854,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32559,4 +32585,7 @@
 #~ msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida."
 
+#~ msgid "Errors during Download"
+#~ msgstr "Viga allalaadimisel"
+
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameeter ''{0}'' ei tohi olla tühi"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 21603)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:37+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-06-07 09:15+0200\n"
+"PO-Revision-Date: 2010-06-06 22:23+0000\n"
+"Last-Translator: Kalle Lampila <Unknown>\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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -262,6 +262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -434,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -647,12 +647,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1463,5 +1463,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1482,5 +1483,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1652,5 +1653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -2242,6 +2243,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "Virheitä latauksen aikana"
 
@@ -2276,7 +2277,7 @@
 msgstr "({0}/{1}) Ladataan relaation {2} emoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Virheitä latauksen aikana"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr "Virhe latauksen aikana"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2540,10 +2541,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Etsi..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Etsi kohteita."
@@ -2551,41 +2552,41 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Kirjoita suodatuslauseke."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Kirjoita hakuehdot."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Kirjoita hakulauseke"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "korvaa valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "lisää valintaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "poista valinnasta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "etsi valinnasta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "kirjainkoko merkitsee"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "säännöllinen lauseke"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
@@ -2593,5 +2594,5 @@
 "tai arvossa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
@@ -2599,13 +2600,13 @@
 "arvossa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Sörn</b> - ''Sörn'' missä tahansa kohtaa arvoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - avaimen ''type'' arvo täsmälleen ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2615,21 +2616,21 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Sörn</b> - ei merkkijonoa ''Sörn'' arvossa."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 tai on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - avain foot asetettuna"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Erityisehdot:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2638,17 +2639,17 @@
 "<b>relation</b> (relaatio))"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - annetun käyttäjän muokkaamat kohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - anonyymin käyttäjän muokkaamat kohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - kohde, jolla on annettu tunniste (0 uusille kohteille)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2658,5 +2659,5 @@
 "kohteilla 0)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2666,5 +2667,5 @@
 "(kokoelmiin kuulumattomilla 0)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2674,5 +2675,5 @@
 "nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2682,5 +2683,9 @@
 "tags:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2690,21 +2695,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> tai <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - kaikki muokatut kohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - kaikki valitut kohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - kaikki keskeneräiset kohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - kaikki tagittomat kohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2713,5 +2718,5 @@
 "lapsikohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2719,9 +2724,9 @@
 "<b>parent <i>ehdot</i></b> - kaikki hakuehdot täyttävien kohteiden emokohteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "<b>|</b> tai <b>OR</b> yhdistää ehdot (looginen \"tai\"-lause)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2729,5 +2734,5 @@
 "tekstejä (esim. <b>:</b> avaimessa)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2737,11 +2742,11 @@
 "<b>\\</b> (<b>\\\"</b> ja <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Voit ryhmitellä hakuehtoja suluilla <b>(</b> and <b>)</b>."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2749,38 +2754,38 @@
 msgstr "Suodin"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Etsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Toteuta suodin"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Aloita haku"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Valintaan ei lisätty mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Valinnasta ei poistettu mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Valinnasta ei löytynyt mitään hakusanalla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2788,5 +2793,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2794,5 +2799,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2800,5 +2805,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2816,14 +2821,17 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2831,36 +2839,36 @@
 "Tuntematon objektin tyyppi: {0}. Sallitut arvot ovat node, way ja relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "OR-operaattorilta puuttuu parametri"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Olisi pitänyt olla objektin tunniste"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2929,5 +2937,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3536,5 +3544,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3591,5 +3599,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3597,5 +3605,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3603,17 +3611,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "teksti"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "L"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3621,5 +3623,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3628,5 +3630,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3634,5 +3636,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3640,5 +3642,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3646,43 +3648,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Suodatus päällä</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> kohdetta piilossa"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> kohdetta himmeänä"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Saat kaikki kohteet näkyviin sulkemalla suodinpaneelin.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Objekti, jonka tunniste on 0, ei voi olla näkymätön"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3693,5 +3695,5 @@
 "oli {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3700,5 +3702,5 @@
 "Objekteja ei voi yhdistää, koska jompikumpi niistä on uusi, mutta toinen ei"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3765,83 +3767,83 @@
 msgstr "Parametri {0} ei ole välillä 0..{1}. Saatiin ”{2}”."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Useita \"via\" -jäseniä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Ei \"from\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Ei \"to\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kiellolle {0} ei löydy piirtotyyliä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Virhe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4442,6 +4444,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4456,4 +4458,5 @@
 msgstr "Muokkaa"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4652,5 +4655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4972,6 +4975,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4983,5 +4987,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Alas"
@@ -5308,6 +5312,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5320,6 +5324,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5673,6 +5677,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5697,5 +5700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5703,5 +5706,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5794,13 +5797,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Piilota tai himmennä objekteja suotimilla."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5809,45 +5812,41 @@
 msgstr "Lisää"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Lisää suodin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Muokkaa suodinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Poista suodin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Nosta suodinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Laske suodinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Ota suodin käyttöön"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Piilota kohteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Sovella myös lapsikohteisiin"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Käänteinen suodatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Suodatustapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6074,10 +6073,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Valitse relaatioluettelosta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Valitse relaatio relaatioluettelosta"
@@ -6422,4 +6421,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7678,5 +7678,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7685,23 +7685,23 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7710,5 +7710,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7717,77 +7717,81 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Valitse relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Valitse relaatio päävalinnasta"
@@ -8494,4 +8498,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -9136,5 +9141,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9982,5 +9987,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10282,64 +10287,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10349,20 +10358,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10371,5 +10380,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10377,21 +10386,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10400,17 +10409,17 @@
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10419,5 +10428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10468,14 +10477,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10484,5 +10493,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10491,10 +10500,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10503,5 +10512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -11355,34 +11364,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Nimetyt reittipisteet."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Näytä tai piilota äänivalikko päävalikosta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11392,5 +11397,5 @@
 "Paikka saadaan gps-jäljestä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11398,21 +11403,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11420,5 +11419,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11426,5 +11425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11432,17 +11431,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Eteenpäinkelauksen nopeuskerroin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Pikakelauksen nopeuskerroin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11450,13 +11449,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11496,5 +11495,5 @@
 msgstr "Värit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11505,34 +11504,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Pakota viivojen piirto, jos segmenttejä ei ole."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Piirrä isot GPS-pisteet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -11540,5 +11539,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11560,5 +11559,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11600,5 +11599,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11612,50 +11611,60 @@
 msgstr "Jalankulku (foot)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Piirrä suuntanuolet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Piirrä virtuaalipisteet valintatilassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Piirrä epäaktiiviset tasot eri värillä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Pehmeä karttagrafiikka (antialisointi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11665,9 +11674,9 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11676,20 +11685,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11697,5 +11706,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11703,13 +11712,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11719,9 +11728,9 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11729,37 +11738,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11767,9 +11776,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11888,6 +11897,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Päivitä liitännäiset"
@@ -13989,10 +13998,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14001,23 +14015,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14025,5 +14034,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14031,17 +14040,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14049,5 +14058,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14059,42 +14068,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Poista liitännäinen käytöstä"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14103,5 +14112,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14110,10 +14119,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14121,10 +14130,10 @@
 msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14132,9 +14141,9 @@
 "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Poistetaanko liitännäinen käytöstä?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14144,14 +14153,14 @@
 "käynnistään uudelleen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "kuvausta ei ole saatavilla"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14509,5 +14518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15783,34 +15792,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Käytä"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Väriteema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -15883,5 +15893,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15972,4 +15982,5 @@
 msgstr "Portti:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -17609,4 +17620,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -19209,5 +19228,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19584,9 +19603,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19597,10 +19613,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Tietokanta ei ole käytössä huoltotoimenpiteiden takia."
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19608,25 +19624,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19637,14 +19653,14 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "talousmetsä"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19730,5 +19746,5 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19742,5 +19758,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19819,5 +19835,5 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19827,57 +19843,60 @@
 msgstr "reitti"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Lisäominaisuudet:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "ei muuttujaa"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Tiedostonimi"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Tikkaat"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Kotisivu"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "List"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Lähennä"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Uusi rooli"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Luo uusi piste."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Tallenna"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20112,6 +20131,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20120,5 +20146,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20127,10 +20153,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20139,5 +20165,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20147,5 +20173,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20154,15 +20180,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20171,5 +20197,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33206,4 +33232,11 @@
 #~ msgstr "Poistetut tai siirretyt objektit"
 
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "L"
+
+#~ msgid "Apply also for children"
+#~ msgstr "Sovella myös lapsikohteisiin"
+
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -33219,2 +33252,5 @@
 #~ "palvelimelta<br>painamalla <strong>{1}</strong>.<br>Ohita painamalla "
 #~ "<strong>{2}</strong>.<br></html>"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Virheitä latauksen aikana"
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 21603)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:36+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-06 16:09+0000\n"
+"Last-Translator: Baptiste Darthenay <e5p3r0-rosetta@yahoo.fr>\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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -87,5 +87,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -194,6 +194,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
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +263,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -318,9 +318,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
@@ -343,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
@@ -436,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -651,12 +651,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -697,5 +697,6 @@
 #: ../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
@@ -737,5 +738,6 @@
 #: ../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
@@ -777,5 +779,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "L'ID spécifié est invalide. Impossible de télécharger l'objet."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -1194,5 +1196,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map layer."
-msgstr ""
+msgstr "Créer un nouveau calque."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
@@ -1349,7 +1351,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
@@ -1479,5 +1481,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1498,5 +1501,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1648,5 +1651,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Afficher le rapport d’état avec les informations utiles pouvant être "
@@ -1670,5 +1674,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1790,5 +1794,6 @@
 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
@@ -1880,5 +1885,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
 
@@ -1950,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)"
@@ -1969,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:1037
@@ -2247,14 +2253,18 @@
 "Click <strong>{0}</strong> to check the state of these objects on the server."
 msgstr[0] ""
+"Cliquer sur <strong>{0}</strong> pour vérifier l'état de cet objet sur le "
+"serveur."
 msgstr[1] ""
+"Cliquer sur <strong>{0}</strong> pour vérifier l'état de ces objets sur le "
+"serveur."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 #, java-format
 msgid "Click <strong>{0}</strong> to ignore.</html>"
-msgstr ""
+msgstr "Cliquer sur <strong>{0}</strong> pour ignorer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178
 msgid "Deleted or moved objects"
-msgstr ""
+msgstr "Objets supprimés ou modifiés"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244
@@ -2265,7 +2275,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Erreurs lors du téléchargement"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Erreurs lors du téléchargement."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2299,7 +2309,7 @@
 msgstr "({0}/{1}) Chargement des parents de la relation {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Erreurs lors du téléchargement."
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr "Une erreur est survenue pendant le téléchargement."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2438,6 +2448,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 ; "
@@ -2568,52 +2578,52 @@
 msgstr "<fin de fichier>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Rechercher..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Rechercher des objets"
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Veuillez entrer une chaine de caractère comme filtre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Entrer le texte à rechercher."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Entrer le texte à rechercher."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "ajouter à la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "supprimer de la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "trouver dans la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "respecter la casse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
@@ -2621,18 +2631,18 @@
 "nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - ''Baker Street'' dans n’importe quelle clé ou nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak''  n’importe où dans le nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - clé ''type'' avec la valeur exacte ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2642,21 +2652,21 @@
 "<b>*=valeur</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - pas ''Bak'' dans le nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>sens unique ?</b> - oneway=yes, true, 1 ou on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot avec n’importe quelle valeur."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Options spéciales :</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2664,9 +2674,9 @@
 "<b>type:</b> - type de l’objet (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>utilisateur :</b>... - tous les objets modifiés par l’utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
@@ -2674,5 +2684,5 @@
 "anonymes"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
@@ -2680,5 +2690,5 @@
 "nouveaux objets)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2688,5 +2698,5 @@
 "version attribuée)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2696,13 +2706,13 @@
 "modifications donné (0 objets sans groupe de modifications attribué)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
 msgstr ""
 "<b>nœuds :</b>... - objet avec un nombre donné de nœuds (nœuds : nombre ou "
 "nœuds : min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2712,5 +2722,9 @@
 "nombre ou attributs : min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr "<b>role:</b>... - objet avec un rôle donné dans une relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2720,21 +2734,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> ou <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tous les objets modifiés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tous les objets sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tous les objets incomplets"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tous les objets sans attribut"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2743,5 +2757,5 @@
 "l’expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2750,9 +2764,9 @@
 "l’expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Utilisez <b>|</b> ou <b>OR</b> pour combiner avec le OU logique"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2760,5 +2774,5 @@
 "contient <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2769,11 +2783,11 @@
 "<b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilisez <b>(</b> et <b>)</b> pour grouper des expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2781,33 +2795,33 @@
 msgstr "Filtrez"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Appliquer le filtre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Commencer la recherche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Aucun résultat trouvé pour \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
@@ -2815,5 +2829,5 @@
 "Aucun résultat lors de la recherche dans la sélection en cherchant ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2821,5 +2835,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2827,5 +2841,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2833,5 +2847,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2850,5 +2864,16 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+"Erreur d'analyse de l'expression régulière \"{0}\", erreur complète:\n"
+"\n"
+"{1}"
+
+#: ../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 ""
@@ -2856,10 +2881,5 @@
 "d’utilisation : clé=valeur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, 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é !"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2868,36 +2888,36 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Jeton inattendu. Attendu {0}, trouvé {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Jeton inattendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Paramètre manquant pour OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Paramètre manquant pour NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Identifiant de primitive attendu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Série de nombres attendus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Identifiant de groupe de modifications attendu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Version attendue"
@@ -2970,5 +2990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3081,6 +3101,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
@@ -3177,5 +3197,5 @@
 #, java-format
 msgid "Deleted ''{0}''"
-msgstr ""
+msgstr "« {0} » supprimé"
 
 #. leave message in one tr() as there is a grammatical
@@ -3184,7 +3204,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 "
@@ -3466,6 +3486,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 "
@@ -3565,5 +3585,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3572,5 +3592,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3579,5 +3599,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3616,5 +3636,5 @@
 "inclue"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3674,5 +3694,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3680,5 +3700,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3686,17 +3706,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Texte"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3704,5 +3718,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3711,5 +3725,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3717,5 +3731,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3723,5 +3737,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3729,44 +3743,44 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtre actif</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objets cachés"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objets désactivés"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
-"</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:489
+"</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
 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:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, 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:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, 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:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3778,5 +3792,5 @@
 "est {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3786,5 +3800,5 @@
 "l'autre ne l'est pas"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3844,5 +3858,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "Impossible de comparer la primitive avec l’identifiant ''{0}'' à la "
@@ -3855,66 +3870,66 @@
 "Le paramètre {0} n’est pas dans la plage 0…{1}. Actuellement il est {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "La zone n’est pas fermée."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Plus d’un chemin d’origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Plus d’un chemin \"to\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Plus d’un chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Type de membre inconnu pour \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d’origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"to\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Pas de nœud ou de chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Le chemin \"from\" ne commence ou ne fini pas par un nœud \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas par un nœud \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Le modèle de la restriction {0} n’a pas été trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -3922,15 +3937,15 @@
 "Le modèle du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Le modèle du chemin extérieur \"{0}\" ne correspond pas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Erreur : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4106,8 +4121,9 @@
 #: ../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
@@ -4177,5 +4193,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4185,5 +4201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4192,5 +4208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4199,5 +4215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4206,5 +4222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4213,5 +4229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4220,9 +4236,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4553,6 +4569,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4567,4 +4583,5 @@
 msgstr "Modifier"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4727,6 +4744,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
@@ -4767,5 +4784,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4806,6 +4823,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 "
@@ -4840,5 +4857,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"
@@ -4847,5 +4864,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"
@@ -4854,5 +4871,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"
@@ -5039,5 +5056,6 @@
 #: ../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
@@ -5047,5 +5065,6 @@
 #: ../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
@@ -5082,5 +5101,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés à la fin de la liste des éléments "
@@ -5111,6 +5131,7 @@
 msgstr "Copier tous leurs éléments dans la cible"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5122,5 +5143,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Descendre"
@@ -5165,6 +5186,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 "
@@ -5174,6 +5195,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 "
@@ -5230,6 +5251,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 "
@@ -5259,9 +5280,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
@@ -5302,5 +5323,6 @@
 #: ../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
@@ -5412,6 +5434,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
@@ -5463,6 +5485,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5475,6 +5497,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5534,5 +5556,6 @@
 #, 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
@@ -5729,6 +5752,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
@@ -5796,7 +5819,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 "
@@ -5824,5 +5847,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 "Télécharger les informations sur le groupe de modifications sélectionné "
@@ -5842,6 +5866,5 @@
 msgstr "Ouvrir une page Internet pour chaque groupe de modifications"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5865,5 +5888,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5871,5 +5894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5943,16 +5966,17 @@
 #, 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
@@ -5969,13 +5993,13 @@
 msgstr "Résoudre les conflits pour ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrer les objets et les masquer/désactiver."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5984,45 +6008,41 @@
 msgstr "Ajouter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Ajouter un filtre."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Modifier le filtre."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Supprimer le filtre."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Déplacer le filtre vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Déplacer le filtre vers le bas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Activer le filtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Masquer les éléments"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Appliquer aussi pour les enfants"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Inverser le filtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Mode filtre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6249,10 +6269,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Sélectionner dans la liste des relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Sélectionnez une relation dans la liste des relations."
@@ -6502,5 +6522,6 @@
 #, 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
@@ -6516,5 +6537,6 @@
 #: ../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
@@ -6584,5 +6606,6 @@
 #: ../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
@@ -6610,4 +6633,5 @@
 msgstr "Identifiant"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7752,9 +7776,10 @@
 #, 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
@@ -7764,6 +7789,7 @@
 "{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
@@ -7782,8 +7808,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>. "
@@ -7802,6 +7828,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
@@ -7814,6 +7840,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
@@ -7917,7 +7943,8 @@
 #: ../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:186
+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:187
 #, java-format
 msgid "This will change {0} object."
@@ -7926,23 +7953,23 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Une valeur vide supprime l’attribut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Modifier les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7951,5 +7978,5 @@
 msgstr[1] "Modifier les propriétés de {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7958,77 +7985,81 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Sélectionnez une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Sélectionnez une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Sélectionnez les objets dont vous voulez modifier les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Afficher les propriétés de la sélection"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Ajouter des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Modifier la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Voulez-vous vraiment supprimer la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Supprimer des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé / valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifier la valeur de la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Sélectionner une relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Sélectionner une relation dans la sélection principale."
@@ -8112,5 +8143,6 @@
 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
@@ -8142,15 +8174,17 @@
 #: ../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
@@ -8167,6 +8201,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 "
@@ -8340,9 +8374,11 @@
 #, 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
@@ -8691,10 +8727,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>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
@@ -8753,4 +8790,5 @@
 msgstr "Interrogation du serveur de noms..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8834,11 +8872,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>"
@@ -8849,6 +8887,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 "
@@ -8887,6 +8925,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"));
@@ -8913,5 +8951,6 @@
 #, 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
@@ -9149,17 +9188,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>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
@@ -9173,7 +9213,8 @@
 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 "
@@ -9220,7 +9261,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
@@ -9284,5 +9325,6 @@
 #: ../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
@@ -9296,5 +9338,6 @@
 #: ../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"));
@@ -9446,5 +9489,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Ouvrir un répertoire"
@@ -9461,5 +9504,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Le calque ''{0}'' a des modifications qui devraient être envoyées vers le "
@@ -9545,6 +9589,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
@@ -9559,10 +9603,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 "
@@ -9578,6 +9622,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 "
@@ -9587,6 +9631,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 "
@@ -9830,5 +9874,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9847,6 +9891,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
@@ -9856,10 +9900,12 @@
 "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
@@ -9878,6 +9924,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 "
@@ -9893,6 +9939,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 "
@@ -9928,6 +9974,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 "
@@ -9987,7 +10033,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 "
@@ -10001,5 +10047,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -10026,5 +10072,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr "L’exception est ignorée car l’envoi a été annulé. Exception : {0}"
 
@@ -10109,6 +10156,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
@@ -10261,7 +10308,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 "
@@ -10290,7 +10337,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 "
@@ -10357,6 +10404,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>L’envoi de données GPS non traitées <br>sur la carte est considéré "
@@ -10372,5 +10419,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10552,6 +10599,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é "
@@ -10613,7 +10660,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 "
@@ -10685,64 +10732,68 @@
 msgstr "Estimation automatique"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Ajustement manuel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Ignorer la position pour : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Images avec géolocalisation dans les métadonnées EXIF ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Images qui sont déjà taguées ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Afficher les vignettes sur la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Fuseau horaire : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Décallage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Corréler les images avec la trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Corréler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Fuseau horaire invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Décallage invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Essayez encore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Aucune image ne correspond !"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Aucun GPX sélectionné"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10752,23 +10803,23 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+"<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
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuseau horaire : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10777,5 +10828,5 @@
 msgstr[1] "(Différence de {0} jours)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10786,22 +10837,22 @@
 "manuellement."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "La correspondance des photos avec la trace a échoué"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 "Les photos sélectionnées ne contiennent pas d’information d’horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Les photos ne contienne tpas d’information d’horodatage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10811,17 +10862,17 @@
 "autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "La trace GPX n’a pas d’horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Vous devez sélectionner une trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Aucune trace GPX sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10832,5 +10883,5 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10883,14 +10934,14 @@
 msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10899,5 +10950,5 @@
 msgstr[1] "{0} images chargées."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10906,10 +10957,10 @@
 msgstr[1] "{0} ont un attribut GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Supprimer le fichier de l'image du disque"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10920,5 +10971,5 @@
 "perdu !</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Le fichier de l'image n'a pas pu être supprimé."
@@ -11160,7 +11211,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
@@ -11225,6 +11276,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 "
@@ -11257,8 +11308,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 "
@@ -11311,6 +11362,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
@@ -11394,6 +11445,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
@@ -11401,11 +11452,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
@@ -11520,9 +11571,11 @@
 #, 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 ''***'' "
@@ -11626,6 +11679,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
@@ -11668,8 +11721,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 "
@@ -11679,6 +11732,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
@@ -11775,14 +11828,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
@@ -11815,11 +11868,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
@@ -11891,35 +11944,32 @@
 msgstr "Afficher la trace audio \"en direct\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Créer des marqueurs non-audio en lisant le GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Points avec des horodatages valides."
 
+#: ../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."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Points avec un horodatage estimé à partir de la position de la trace."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Nommer les points de parcours."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Horodatage modifié des fichiers audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 "Début de la trace (par défaut si aucun autre marqueur n’est disponible)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Afficher ou masquer le menu Audio de la barre de menu principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11929,5 +11979,5 @@
 "la trace."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11936,23 +11986,15 @@
 "Placer un texte à côté des marqueurs audio (image et web) et de leurs icônes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Créer automatiquement un calque de marqueurs à partir des points à "
-"l’ouverture d’un calque GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Lors de l’import de fichiers audio, créer des marqueurs depuis :"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "L’appliquer à tous les points du calque GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11962,5 +12004,5 @@
 "(plutôt que des chemins) avec des noms ou des descriptions."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11970,5 +12012,5 @@
 "l’heure de modification de chaque fichier WAV importé."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11978,17 +12020,17 @@
 "bouton."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Temps pour avancer/reculer (en secondes)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Multiplicateur de vitesse lors de l’avance rapide."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Multiplicateur d’avance rapide"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11997,9 +12039,9 @@
 "Nombre de secondes avant (ou après si négatif) la position de la piste audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Délai (en secondes)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
@@ -12007,5 +12049,5 @@
 "écoulé."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Étalonnage de l’enregistrement de la voix"
@@ -12045,5 +12087,5 @@
 msgstr "Couleurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12054,35 +12096,35 @@
 msgstr "Tous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Fichiers locaux"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Aucun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Forcer les lignes si aucun segment n’est importé."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Dessiner un cercle d’après les valeurs HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Vitesse (rouge = lent, vert = rapide)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Atténuation de la précision (rouge = élevée, vert = faible, si disponible)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Atténuation de la précision (rouge = élevée, vert = faible, si disponible)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Une seule couleur (personnalisable pour les calques nommés)"
@@ -12090,5 +12132,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12110,5 +12152,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12150,5 +12192,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12162,50 +12204,63 @@
 msgstr "Piéton"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Dessin rapide (moins joli)"
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Seulement pour les directions intéressantes (sens unique par exemple)"
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr "Seulement pour les directions intéressantes (sens unique par exemple)"
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Seulement à l’extrémité du chemin."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Afficher l’ordre des segments"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Afficher les limites des données téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Afficher les nœuds virtuels dans le mode sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Afficher les calques inactifs sous une autre couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Appliquer un anticrénelage (anti-aliasing) sur la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Créer automatiquement un calque de marqueurs à partir des points à "
+"l’ouverture d’un calque GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Dessiner des lignes entre les points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12215,9 +12270,9 @@
 "Entrez ''-1'' pour tracer toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Longueur maximale des fichiers locaux (mètres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12226,10 +12281,10 @@
 "toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Longueur maximale (mètres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12238,5 +12293,5 @@
 "d’information sur les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -12244,6 +12299,7 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Dessiner les flèches de direction en utilisant un aperçu des données plutôt "
@@ -12251,5 +12307,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12259,13 +12315,13 @@
 "valeur l’une de l’autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Distance minimale (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Afficher de plus gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12275,9 +12331,9 @@
 "dans le Gestionnaire de calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Colorie les segments et les points en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12287,37 +12343,38 @@
 "précision (HDOP). Votre instrument doit enregistrer cette information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permet de colorier la trace en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Colorier les traces et les points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Dessiner les flèches de direction pour les sections de chemin."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Afficher l’ordre de tous les segments des chemins."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un anticrénelage aux contours de la carte."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Afficher les limites des données téléchargées depuis le serveur."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12326,9 +12383,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Afficher les calques de données inactifs sous une autre couleur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Données OSM"
@@ -12400,8 +12457,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] "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> :"
@@ -12449,6 +12508,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Mettre à jour"
@@ -12530,6 +12589,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 "
@@ -12548,9 +12607,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 "
@@ -12863,6 +12922,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 "
@@ -12993,10 +13052,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
@@ -13019,11 +13078,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
@@ -13034,6 +13093,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>"
 
@@ -13093,6 +13152,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
@@ -13113,6 +13172,8 @@
 
 #: ../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
@@ -13129,5 +13190,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 "Vous possédez déjà une autorisation d’accès au serveur OSM utilisant OAuth."
@@ -13228,9 +13290,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
@@ -13558,5 +13620,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
@@ -13603,5 +13665,6 @@
 #, 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
@@ -13753,5 +13816,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "Aucune primitive avec l’identifiant {0} n’a été trouvée dans le jeu de "
@@ -13853,5 +13917,6 @@
 #, 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
@@ -13949,5 +14014,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
 msgid "Current changeset is null. Cannot upload data."
-msgstr "Le groupe de modifications est vide. Impossible d’envoyer les données."
+msgstr ""
+"Le groupe de modifications est vide. Impossible d’envoyer les données."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
@@ -14179,15 +14245,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
@@ -14214,6 +14280,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 = "
@@ -14261,5 +14327,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "La valeur pour l’attribut ''ref'' sur le membre de la relation {0} est "
@@ -14749,16 +14816,21 @@
 #, 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 "
 "est {2}.<br>Vous devez mettre à jour JOSM pour utiliser ce greffon.</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "chargement du greffon ''{0}'' (version {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14769,23 +14841,18 @@
 "''{1}''du greffon n’a pas été trouvée.<br>Le supprimer des préférences ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Chargement des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Vérification des conditions requises des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Téléchargement du greffon \"{0}\"..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14795,5 +14862,5 @@
 "JOSM ne parvient pas à trouver d’information sur les greffons suivants :"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14801,17 +14868,17 @@
 msgstr[1] "Les greffons ne seront pas chargés."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Déterminer les greffons à charger..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Suppression des greffons dépréciés..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Suppression des greffons plus supportés..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14819,5 +14886,5 @@
 msgstr[1] "Les mises à jour des greffons suivants ont échoué :"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14833,10 +14900,10 @@
 "les mettre à jour manuellement."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "La mise à jour du greffon a échoué"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
@@ -14844,33 +14911,33 @@
 "greffons a échoué"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Désactiver le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Supprimer le greffon ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Garder le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Garder le greffon ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Attention : la suppression du greffon périmé ''{0}'' a échoué."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14882,5 +14949,5 @@
 "installée."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14891,22 +14958,22 @@
 "de téléchargement ''{1}'' a échoué. Impossible de renommer."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Désactiver le greffon \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Une exception inattendue pouvant provenir du greffon \"{0}\" est survenue."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Une exception inattendue pouvant provenir du greffon \"{0}\" est survenue."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "D’après les informations du greffon, l’auteur est {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14915,9 +14982,9 @@
 "remplir un rapport d’erreur."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Ce greffon doit-il être désactivé ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14927,14 +14994,14 @@
 "que le greffon ne soit plus chargé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Informations sur le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "Aucune description disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14979,5 +15046,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Attention : l’analyse du fichier ''{0}'' concernant l’information du greffon "
@@ -15045,5 +15113,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"
@@ -15115,6 +15183,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>"
 
@@ -15128,7 +15196,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
@@ -15139,8 +15207,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
@@ -15148,6 +15216,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 "
@@ -15158,7 +15226,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 "
@@ -15169,7 +15237,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 "
@@ -15180,8 +15248,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 "
@@ -15207,7 +15275,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 "
@@ -15283,6 +15351,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
@@ -15298,10 +15366,11 @@
 #, 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
@@ -15312,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 "
@@ -15354,14 +15423,14 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"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:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15464,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
@@ -16085,7 +16154,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16095,5 +16164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16103,5 +16172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16117,5 +16186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16125,5 +16194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16154,5 +16223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16161,5 +16230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16168,5 +16237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16175,5 +16244,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16182,5 +16251,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16189,5 +16258,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -16221,16 +16290,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 "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.html\">  http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a><br>"
+"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>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16241,6 +16313,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
@@ -16436,5 +16508,6 @@
 #: ../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
@@ -16585,5 +16658,6 @@
 #: ../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
@@ -16748,34 +16822,35 @@
 msgstr "Erreur de cache pour la zone Lambert"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Utiliser"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Veuillez sélectionner un jeu à utiliser."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Jeu de couleurs"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Veuillez sélectionner un jeu à supprimer."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Utiliser le jeu sélectionné dans la liste."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Utiliser la couleur actuelle comme un nouveau jeu de couleurs."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Supprimer le jeu sélectionné de la liste"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Jeux de couleurs"
@@ -16851,5 +16926,5 @@
 msgstr "Calque pour modifier les traces GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir en calque GPX en rendant anonyme l’horodatage"
@@ -16942,4 +17017,5 @@
 msgstr "Port :"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -17005,6 +17081,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
@@ -17154,5 +17230,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17273,5 +17349,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Nombre maximum de segments autorisés dans chaque chemin généré (250 par "
@@ -17296,6 +17373,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Précision de la simplification des lignes par la méthode Douglas-Peucker, en "
@@ -17552,5 +17630,6 @@
 #: ../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
@@ -17593,7 +17672,8 @@
 "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
@@ -17606,7 +17686,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
@@ -17621,5 +17701,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "L’entête contient plusieurs valeurs et ne peut être décrit en une seule "
@@ -17736,5 +17817,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 "Vous avez des modifications non-sauvegardées dans votre file d’attente. "
@@ -17789,8 +17871,9 @@
 
 #: ../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
@@ -17821,5 +17904,6 @@
 #: ../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
@@ -17843,6 +17927,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
@@ -18109,5 +18193,6 @@
 #: ../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
@@ -18196,5 +18281,6 @@
 #, 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
@@ -18487,5 +18573,6 @@
 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
@@ -18617,4 +18704,12 @@
 msgid "Terrace"
 msgstr "Bâtiments mitoyens"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -18854,6 +18949,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
@@ -18863,6 +18958,7 @@
 "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
@@ -19073,5 +19169,6 @@
 #: ../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
@@ -19101,6 +19198,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 "
@@ -19127,6 +19224,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
@@ -19198,8 +19295,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 ""
 
@@ -19261,8 +19358,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 ""
 
@@ -19327,7 +19424,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
@@ -19337,7 +19434,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
@@ -19392,15 +19489,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-"
@@ -19506,5 +19603,6 @@
 #: ../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
@@ -19736,5 +19834,6 @@
 #: ../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
@@ -20019,5 +20118,6 @@
 #, 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:591
@@ -20056,6 +20156,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"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 "
@@ -20207,5 +20308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -20306,5 +20407,5 @@
 msgstr "{0}…"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -20370,6 +20471,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
@@ -20397,8 +20498,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
@@ -20518,6 +20619,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
@@ -20712,9 +20813,6 @@
 msgstr "Fichiers WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20725,10 +20823,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "La base de données est déconnectée pour maintenance"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20738,16 +20836,16 @@
 "demande plus. Demandez un plus petit nombre ou utilisez planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "impossible d’obtenir un flux d’entré audio depuis l’URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Disposotof audio non disponible"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
@@ -20755,10 +20853,10 @@
 "données"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr "Ville"
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20766,17 +20864,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "forêt"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20784,7 +20882,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20794,5 +20892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20835,5 +20933,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20843,5 +20941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20851,5 +20949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20859,8 +20957,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20874,5 +20972,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20883,5 +20981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20890,7 +20988,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20900,5 +20998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20908,5 +21006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20916,5 +21014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20924,5 +21022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20932,5 +21030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20940,5 +21038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20948,8 +21046,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20959,59 +21057,60 @@
 msgstr "itinéraire"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Attributs optionnels :"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Modificateurs :"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nom du fichier"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Échalier"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Types de carburant :"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Page d’accueil"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoïsme"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Zoom avant"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nouveau rôle"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Créer un nouveau nœud."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Enregistrer"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -21094,5 +21193,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Télécharge les points GPS depuis un système d’enregistrement Globalsat DG100 "
@@ -21197,5 +21297,6 @@
 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
@@ -21246,6 +21347,6 @@
 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
@@ -21289,6 +21390,13 @@
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21299,5 +21407,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21308,10 +21416,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 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:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21322,5 +21430,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21330,24 +21438,25 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 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:91
+#: build/trans_plugins.java:93
 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:93
+#: build/trans_plugins.java:95
 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:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21357,5 +21466,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22246,7 +22355,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -22386,8 +22495,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"/>
@@ -22597,5 +22706,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22605,5 +22714,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22622,5 +22731,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22630,5 +22739,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22647,5 +22756,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22655,5 +22764,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22672,5 +22781,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22680,5 +22789,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22693,5 +22802,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22709,5 +22818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22725,5 +22834,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22732,5 +22841,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22740,5 +22849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22758,5 +22867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22765,5 +22874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22773,5 +22882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -23475,5 +23584,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -23524,5 +23633,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -23619,5 +23728,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23785,5 +23894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -24117,5 +24226,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24125,5 +24234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24133,5 +24242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24141,5 +24250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24149,5 +24258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24157,5 +24266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24165,5 +24274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24174,5 +24283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25592,5 +25701,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25600,5 +25709,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25608,5 +25717,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25616,5 +25725,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25978,7 +26087,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25988,5 +26097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25996,5 +26105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26004,5 +26113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26012,5 +26121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26020,5 +26129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26028,5 +26137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26036,5 +26145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26044,5 +26153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26052,5 +26161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26060,5 +26169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26068,5 +26177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26076,5 +26185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26084,5 +26193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26092,5 +26201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26100,5 +26209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26108,5 +26217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26116,5 +26225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26124,5 +26233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26132,5 +26241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26140,5 +26249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26148,5 +26257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26156,5 +26265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26164,5 +26273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26172,5 +26281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26180,5 +26289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26188,5 +26297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26196,5 +26305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26204,5 +26313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26212,5 +26321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26220,5 +26329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26228,5 +26337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26236,5 +26345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26244,5 +26353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26252,5 +26361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26260,5 +26369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26268,5 +26377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26276,5 +26385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26284,5 +26393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26292,5 +26401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26300,5 +26409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26308,5 +26417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26316,5 +26425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26324,5 +26433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26332,5 +26441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26340,5 +26449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26348,5 +26457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -28053,7 +28162,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28063,5 +28172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28071,5 +28180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28079,5 +28188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28087,5 +28196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28095,5 +28204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28103,5 +28212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28111,5 +28220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28119,5 +28228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -29540,5 +29649,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29554,5 +29663,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29562,5 +29671,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -29571,5 +29680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29582,7 +29691,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29592,5 +29701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29600,5 +29709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29608,5 +29717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29616,5 +29725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29648,5 +29757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29662,5 +29771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29670,5 +29779,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29677,5 +29786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29685,5 +29794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29694,5 +29803,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29717,5 +29826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29830,9 +29939,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
@@ -29840,5 +29949,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,
@@ -29848,8 +29957,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
@@ -29863,5 +29972,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29869,5 +29978,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29916,6 +30025,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>
@@ -29995,5 +30104,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30003,11 +30112,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -30023,5 +30132,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30030,5 +30139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30037,5 +30146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30051,5 +30160,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30063,5 +30172,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30070,5 +30179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30077,5 +30186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30084,5 +30193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30091,5 +30200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30098,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30105,5 +30214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30112,5 +30221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30119,5 +30228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30126,5 +30235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30133,5 +30242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30140,5 +30249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30147,5 +30256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30154,5 +30263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -30161,5 +30270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -30336,7 +30445,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30350,5 +30459,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30358,7 +30467,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30368,5 +30477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30376,5 +30485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30384,5 +30493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30392,5 +30501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -30406,5 +30515,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30413,5 +30522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30421,5 +30530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30428,5 +30537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30435,5 +30544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30442,5 +30551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30449,5 +30558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30456,5 +30565,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30463,5 +30572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30470,5 +30579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30477,5 +30586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30484,5 +30593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -30496,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -30508,5 +30617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30515,5 +30624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -30527,5 +30636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -30540,5 +30649,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -30553,5 +30662,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -30565,5 +30674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -30577,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30584,5 +30693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30591,5 +30700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30599,5 +30708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30606,5 +30715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30613,5 +30722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30620,5 +30729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30628,5 +30737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30637,5 +30746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30645,7 +30754,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30655,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30663,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30671,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30680,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30687,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30695,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30703,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30711,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30719,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30727,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30735,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30743,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30751,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30759,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30780,5 +30889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30793,7 +30902,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30803,5 +30912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30810,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30818,5 +30927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30825,5 +30934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30833,5 +30942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30841,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30855,5 +30964,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30864,5 +30973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30881,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30889,5 +30998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30900,5 +31009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30917,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30924,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30931,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30938,7 +31047,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30949,5 +31058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30962,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30974,5 +31083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30982,5 +31091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30994,5 +31103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -31006,5 +31115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31013,5 +31122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31020,7 +31129,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31030,5 +31139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31038,5 +31147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31046,5 +31155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31054,5 +31163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31062,5 +31171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -31076,7 +31185,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -31091,5 +31200,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -31104,5 +31213,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -31117,5 +31226,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -31130,5 +31239,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -31143,5 +31252,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -31156,7 +31265,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31166,5 +31275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31173,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31181,5 +31290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31189,5 +31298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31197,5 +31306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31205,5 +31314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31213,5 +31322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31221,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31229,5 +31338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31237,5 +31346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31245,5 +31354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31253,5 +31362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31261,5 +31370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -31279,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -31292,5 +31401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -31303,7 +31412,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31313,5 +31422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31321,5 +31430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31329,5 +31438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31337,5 +31446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31345,5 +31454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31353,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31361,5 +31470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31369,5 +31478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31377,5 +31486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31385,5 +31494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31393,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31401,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31409,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31417,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31425,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31433,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -31453,5 +31562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -31465,7 +31574,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31475,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31483,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31491,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31499,5 +31608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31507,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31515,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31523,5 +31632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31531,5 +31640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31539,5 +31648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31547,5 +31656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -31564,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31572,5 +31681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31580,5 +31689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31588,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31596,5 +31705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31604,5 +31713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31612,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31620,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31628,5 +31737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31636,5 +31745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31644,5 +31753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31652,5 +31761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31669,5 +31778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31676,5 +31785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31684,5 +31793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31691,5 +31800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31699,5 +31808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31707,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31715,5 +31824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31722,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31730,5 +31839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31738,5 +31847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31746,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31754,5 +31863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31761,5 +31870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31768,5 +31877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31775,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31782,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31789,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31796,5 +31905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31803,5 +31912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31810,5 +31919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31817,5 +31926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31824,5 +31933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31831,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31838,5 +31947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31845,5 +31954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31853,5 +31962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31861,5 +31970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31869,5 +31978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31877,5 +31986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31885,5 +31994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31893,5 +32002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31901,5 +32010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31909,5 +32018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31917,5 +32026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31926,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31934,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31942,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31950,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31958,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31966,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31974,5 +32083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31982,5 +32091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31990,5 +32099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31998,5 +32107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32006,5 +32115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32014,5 +32123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32022,5 +32131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32030,5 +32139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32038,5 +32147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32046,5 +32155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -32054,5 +32163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32062,5 +32171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32070,5 +32179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32078,5 +32187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32085,5 +32194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -32115,5 +32224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32123,5 +32232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32131,7 +32240,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -32146,5 +32255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32154,5 +32263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32162,5 +32271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32170,5 +32279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32178,5 +32287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32186,5 +32295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32194,5 +32303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -32208,7 +32317,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32218,5 +32327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32226,5 +32335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32234,5 +32343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32242,5 +32351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32250,5 +32359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32258,5 +32367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32266,5 +32375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32274,5 +32383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32282,5 +32391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32290,5 +32399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32298,5 +32407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32306,5 +32415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32314,5 +32423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32322,5 +32431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32330,5 +32439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32338,5 +32447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32346,5 +32455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32354,5 +32463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32362,5 +32471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32370,5 +32479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32378,5 +32487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32386,5 +32495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32394,5 +32503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32402,5 +32511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32410,5 +32519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32418,5 +32527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32426,5 +32535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32434,5 +32543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32442,5 +32551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32450,5 +32559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32458,5 +32567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32466,5 +32575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32474,5 +32583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32482,5 +32591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32490,5 +32599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32498,5 +32607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32506,5 +32615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32514,5 +32623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32522,5 +32631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32530,5 +32639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32538,5 +32647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32546,5 +32655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -32580,7 +32689,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32590,5 +32699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32598,5 +32707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32606,5 +32715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32614,5 +32723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32622,5 +32731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32630,5 +32739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32638,5 +32747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32653,5 +32762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32661,5 +32770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32669,5 +32778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32677,5 +32786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32685,5 +32794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32693,5 +32802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32702,5 +32811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32710,5 +32819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32718,5 +32827,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32726,5 +32835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32733,5 +32842,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32740,5 +32849,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32756,7 +32865,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32766,5 +32875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32774,5 +32883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32782,5 +32891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32790,5 +32899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32798,5 +32907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32806,5 +32915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32814,5 +32923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32822,5 +32931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32830,5 +32939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32846,5 +32955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32858,5 +32967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32870,5 +32979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32878,5 +32987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32890,5 +32999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32902,6 +33011,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32911,5 +33020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32923,5 +33032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32935,5 +33044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32947,5 +33056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32959,5 +33068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32971,5 +33080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32979,7 +33088,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32989,5 +33098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32997,5 +33106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33005,5 +33114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33013,5 +33122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -33028,5 +33137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -33039,5 +33148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -33051,5 +33160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -33063,5 +33172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -33075,5 +33184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33084,5 +33193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33092,5 +33201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33100,5 +33209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33108,5 +33217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33116,5 +33225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -33131,5 +33240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -33143,5 +33252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -33155,5 +33264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -33167,5 +33276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -33179,5 +33288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -33192,5 +33301,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?
@@ -33216,5 +33325,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33225,11 +33334,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33239,5 +33348,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33247,5 +33356,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33255,5 +33364,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33263,5 +33372,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33271,5 +33380,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33279,5 +33388,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33287,5 +33396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33295,5 +33404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33303,5 +33412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33311,5 +33420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33319,5 +33428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33327,5 +33436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -33345,5 +33454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -33438,5 +33547,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -33444,28 +33553,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
@@ -33580,5 +33689,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33591,5 +33700,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>
@@ -33614,6 +33723,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33622,6 +33731,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33636,6 +33745,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
@@ -33649,6 +33758,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
@@ -33668,6 +33777,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33691,6 +33800,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
@@ -33733,4 +33842,5 @@
 #~ 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}"
@@ -33739,7 +33849,9 @@
 #~ 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}"
@@ -33750,4 +33862,5 @@
 #~ msgstr[1] "images"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dans la trace."
@@ -33759,4 +33872,5 @@
 #~ 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:"
@@ -33788,4 +33902,5 @@
 #~ msgstr "faux"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Résoudre {0} conflits dans {1} objets"
@@ -33797,4 +33912,5 @@
 #~ msgstr "sans-nom"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Erreur durant le chargement de la page {0}"
@@ -33807,10 +33923,11 @@
 #~ "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}"
@@ -33825,4 +33942,5 @@
 #~ msgstr "Impossible de se connecter au serveur."
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Images pour {0}"
@@ -33830,4 +33948,7 @@
 #~ msgid "Anonymous"
 #~ msgstr "Anonyme"
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Créer des marqueurs non-audio en lisant le GPX."
 
 #~ msgid "<p>Thank you for your understanding</p>"
@@ -33856,6 +33977,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"
@@ -33868,4 +33989,5 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -33934,4 +34056,5 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
@@ -33951,10 +34074,11 @@
 #~ 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}"
@@ -33963,4 +34087,5 @@
 #~ 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}\"."
@@ -33972,19 +34097,18 @@
 #~ "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 "
@@ -33996,10 +34120,9 @@
 #~ 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. "
@@ -34025,4 +34148,5 @@
 #~ msgstr "Lecture GPX..."
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -34039,4 +34163,5 @@
 #~ 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}"
@@ -34056,6 +34181,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:"
@@ -34065,4 +34190,5 @@
 #~ msgstr "Erreur d'analyse de la réponse du serveur"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -34151,6 +34277,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"
@@ -34167,13 +34293,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 ""
-#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant "
-#~ "de rapporter un bogue."
-
+#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant de "
+#~ "rapporter un bogue."
+
+#, java-format
 #~ 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}\""
@@ -34183,6 +34311,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 "
@@ -34199,6 +34327,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"
@@ -34208,9 +34336,8 @@
 #~ 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"
@@ -34247,9 +34374,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"
@@ -34263,4 +34390,5 @@
 #~ "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}"
@@ -34269,13 +34397,17 @@
 #~ 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}\"."
@@ -34306,20 +34438,24 @@
 #~ 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}\"."
 
+#, 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"
@@ -34338,4 +34474,5 @@
 #~ msgstr "Chargement vers OSM..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34344,9 +34481,10 @@
 #~ "{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}"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Auteurs : {0}"
@@ -34368,4 +34506,5 @@
 #~ 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"
@@ -34390,6 +34529,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"
@@ -34405,9 +34544,8 @@
 #~ msgstr "Ajouter le commentaire de source suivant :"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
-#~ "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 ""
@@ -34415,6 +34553,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"
@@ -34441,4 +34579,5 @@
 #~ msgstr "Continuer tout de même"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Veuillez rapporter un billet à {0}"
@@ -34475,6 +34614,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 "
@@ -34484,4 +34623,5 @@
 #~ msgstr "Supprimer le calque"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Calques: {0}"
@@ -34493,7 +34633,9 @@
 #~ 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."
@@ -34540,6 +34682,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. "
@@ -34558,4 +34700,5 @@
 #~ msgstr "Déplacer vers le bas"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editeur de relation : {0}"
@@ -34564,4 +34707,5 @@
 #~ msgstr "Déplacer vers le haut"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Changez auparavant la projection en {0}"
@@ -34570,4 +34714,5 @@
 #~ msgstr "Projection invalide"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34584,7 +34729,9 @@
 #~ "é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."
@@ -34594,9 +34741,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."
 
@@ -34641,7 +34788,9 @@
 #~ 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}\""
@@ -34657,7 +34806,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."
@@ -34672,14 +34821,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. "
@@ -34691,11 +34840,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"
@@ -34717,4 +34866,5 @@
 #~ msgstr "Erreur lors du traitement de la réponse au changement envoyé"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34728,6 +34878,5 @@
 #~ "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."
@@ -34745,15 +34894,18 @@
 #~ 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 "
@@ -34761,13 +34913,14 @@
 #~ 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"
-
+#~ "sur les nœuds requièrent des nombres ou des plages de nombres, par exemple : "
+#~ "10-20"
+
+#, java-format
 #~ 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 ""
@@ -34797,8 +34950,9 @@
 #~ 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}."
-
+#~ msgstr "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
+
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Vérification si le nœud {0} est supprimé..."
@@ -34810,30 +34964,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>"
-
+#~ "<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
 #~ 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"
@@ -34879,4 +35033,5 @@
 #~ msgstr "Suppression d’une primitive"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34902,6 +35057,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 "
@@ -34917,6 +35072,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"
@@ -34925,7 +35080,6 @@
 #~ "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 "
@@ -34939,6 +35093,7 @@
 #~ "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 "
@@ -34947,27 +35102,29 @@
 #~ "&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."
-
+#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au niveau "
+#~ "du copyright, dans le doute, ne l'utilisez pas."
+
+#, java-format
 #~ 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}"
@@ -34996,4 +35153,5 @@
 #~ 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."
@@ -35003,6 +35161,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 "
@@ -35023,6 +35181,5 @@
 #~ 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 ""
@@ -35030,7 +35187,8 @@
 #~ "found."
 #~ msgstr ""
-#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
-#~ "été trouvés."
-
+#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été "
+#~ "trouvés."
+
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -35053,50 +35211,56 @@
 #~ 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>"
-
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\".<br>Enlever "
+#~ "de la 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>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."
-
+#~ "Envoyer avec la session de modification existante {0} et la laisser ouverte "
+#~ "pour d'autres envois."
+
+#, java-format
 #~ 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."
-
+#~ "Utiliser la session de modification existante {0} et la fermer après l'envoi."
+
+#, java-format
 #~ 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."
-
+#~ "Envoyer avec la session de modification existante {0} et la fermer après cet "
+#~ "envoi."
+
+#, java-format
 #~ 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."
@@ -35111,10 +35275,12 @@
 #~ 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 "
@@ -35128,10 +35294,11 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "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 "
@@ -35141,13 +35308,17 @@
 #~ "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}"
@@ -35160,4 +35331,5 @@
 #~ "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}"
@@ -35169,16 +35341,21 @@
 #~ 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}"
@@ -35187,20 +35364,23 @@
 #~ 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}"
-
+#~ "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
 #~ 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}\""
-
+#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int (>=0), "
+#~ "reçu \"{1}\""
+
+#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
@@ -35210,4 +35390,5 @@
 #~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Le paramètre ''{0}'' ne doit pas être nul."
@@ -35216,4 +35397,8 @@
 #~ msgstr "Pas de type trouvé. L'historique est vide."
 
+#~ msgid "Apply also for children"
+#~ msgstr "Appliquer aussi pour les enfants"
+
+#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -35222,4 +35407,5 @@
 #~ "plus présente"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
@@ -35238,4 +35424,5 @@
 #~ msgstr "Veuillez redémarrer JOSM."
 
+#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -35243,10 +35430,11 @@
 #~ 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."
-
+#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus nécessaire."
+
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contact de {0}…"
@@ -35260,10 +35448,11 @@
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr ""
-#~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les "
-#~ "données."
-
+#~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les données."
+
+#, java-format
 #~ 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."
@@ -35274,15 +35463,14 @@
 #~ "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 ?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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 ?"
@@ -35294,10 +35482,11 @@
 #~ 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 "GPS point"
@@ -35305,35 +35494,38 @@
 
 #~ 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 "<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>"
 #~ msgstr "<nombre>"
 
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
 #~ msgid "Use all their elements"
 #~ msgstr "Utiliser tous leurs éléments"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pile de commandes : {0}"
@@ -35342,21 +35534,30 @@
 #~ "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."
+
+#, 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é !"
+
+#, 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>"
-
+#~ "<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
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Envoi de {0} objets..."
+
+#~ msgid "Errors during Download"
+#~ msgstr "Erreurs lors du téléchargement"
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:04+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-06 22:24+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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +263,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -317,6 +317,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>"
@@ -341,9 +341,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
@@ -434,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -649,12 +649,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -777,5 +777,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "ID especificado inválido. Non se pode descargar o obxecto."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -786,5 +786,6 @@
 #: ../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
@@ -916,5 +917,6 @@
 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"
@@ -1020,5 +1022,6 @@
 #: ../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
@@ -1229,6 +1232,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
@@ -1296,7 +1299,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
@@ -1476,5 +1479,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1495,5 +1499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1645,5 +1649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Amosar informe de estado con información de utilidade que poida ser engadida "
@@ -1667,5 +1672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1876,5 +1881,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
@@ -1948,9 +1954,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)"
@@ -1967,5 +1973,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2029,6 +2035,6 @@
 "''{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
@@ -2247,14 +2253,18 @@
 "Click <strong>{0}</strong> to check the state of these objects on the server."
 msgstr[0] ""
+"Prema <strong>{0}</strong> para comprobar o estado de este obxecto no "
+"servidor."
 msgstr[1] ""
+"Prema <strong>{0}</strong> para comprobar o estado de estes obxectos no "
+"servidor."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 #, java-format
 msgid "Click <strong>{0}</strong> to ignore.</html>"
-msgstr ""
+msgstr "Prema <strong>{0}</strong> para ignorar. </html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178
 msgid "Deleted or moved objects"
-msgstr ""
+msgstr "Elementos borrados ou ignorados"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244
@@ -2264,6 +2274,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "Erros durante a descarga"
 
@@ -2298,7 +2308,7 @@
 msgstr "({0}/{1}) Cargando parientes da relación {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Erros durante a descarga"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr "Erro durante a descarga"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2412,5 +2422,6 @@
 #: ../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
@@ -2433,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 ""
 "Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o "
@@ -2522,6 +2533,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
@@ -2561,110 +2572,113 @@
 msgstr "<fin-do-ficheiro>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Buscar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Buscar obxectos."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Por favor introduce un filtro para a cadea"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Por favor, introduce unha cadea de busca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Introduce a expresion de búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "engadir á selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "eliminar da selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "buscar a seleccion"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "sensible a maiúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>Baker Street</b> - ''Baker'' e ''Street'' en calquer clave ou nome."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr ""
+"<b>Baker Street</b> - ''Baker'' e ''Street'' en calquer clave ou nome."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' en calquera clave ou nome."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgstr ""
+"<b>\"Baker Street\"</b> - ''Baker Street'' en calquera clave ou nome."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' en calquer posición do nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - a clave ''type'' co valor exacto ''route''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<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:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - que non conteña ''Bak'' no nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>¿sentido único?</b> - oneway=yes, true, 1 o on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - clave=foot establecida con calquer valor."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Obxectivos especiais:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - tipo do obxecto(<b>node</b>,<b>way</b>,<b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+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:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - todos os obxectos cambiados polo usuario"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>usuario:anonimo</b>- todos os obxectos cambiados por usuarios anónimos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>...- obxecto co ID dado (0 para novos obxectos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2674,5 +2688,5 @@
 "asignada)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2682,13 +2696,13 @@
 "cambios dado (0 obxectos sen un conxunto de cambios asignado)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<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:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+"<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:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2698,5 +2712,9 @@
 "contadas ou etiquetas:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2706,21 +2724,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos os obxectos cambiados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos os obxectos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos os obxectos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos os obxectos sen etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2729,5 +2747,5 @@
 "coa expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2736,15 +2754,15 @@
 "expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Usar <b>|</b> ou <b>OR</b> para combinar co operador OU lóxico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
-"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
+"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:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2754,11 +2772,11 @@
 "precedidos por <b>\\</b> (p.ex. <b>\\\"</b> and <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> e <b>)</b> para agrupar expresións"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2766,38 +2784,38 @@
 msgstr "Filtrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Enviar filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Comezar Busca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Non se atoparon coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Non se engadiu nada á selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Non se eliminou da selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nada atopado na seleccion buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2805,5 +2823,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2811,5 +2829,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2817,5 +2835,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2834,5 +2852,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2840,10 +2866,5 @@
 "uso: clave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, 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!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2852,36 +2873,36 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Elemento non esperado. Esperábase {0} pero atopouse {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Mostra non esperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Falta un parametro para OU"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Falta un parametro para NON"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Esperábase un id primitivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Rango de numeros esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Esperabase un id de un conxunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Version esperada"
@@ -2952,5 +2973,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3063,6 +3084,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
@@ -3158,5 +3179,5 @@
 #, java-format
 msgid "Deleted ''{0}''"
-msgstr ""
+msgstr "Borrado \"{0}\""
 
 #. leave message in one tr() as there is a grammatical
@@ -3165,11 +3186,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:459
@@ -3447,6 +3468,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 "
@@ -3542,5 +3563,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3549,5 +3570,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3556,5 +3577,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3593,5 +3614,5 @@
 "incluido"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3650,5 +3671,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3656,5 +3677,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3662,17 +3683,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "texto"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3680,5 +3695,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3687,5 +3702,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3693,5 +3708,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3699,5 +3714,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3705,43 +3720,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro Activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b>obxectos agochados"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> obxectos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Pechar o diálogo de filtrado para ver todos os obxectos.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Unha primitiva con ID = 0 non pode ser invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 Esperada. Tívose {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 Esperada. Tívose {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3752,5 +3767,5 @@
 "changesetId é {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3760,5 +3775,5 @@
 "e a outra non."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3818,5 +3833,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "Non se pode comprar a primitiva con ID \"{0}\" coa primitiva con ID \"{1}\""
@@ -3827,81 +3843,81 @@
 msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "A vía de estilo de área non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Atopadas máis de unha vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Atopadas máis de unha vía \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Atopouse máis de un \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Papel \"{0}\" descoñecido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro descoñecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Non se atoparon vias \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Non se atoparon vías \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Ningún nodo o vía \"vía\" atopados."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non se atopou o estilo para a restrición {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "O estilo da vía interior \"{0}\" é igual á do multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "O estilo da vía exterior \"{0}\" non coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Erro: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3919,5 +3935,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
 msgid "Relation: selected"
-msgstr ""
+msgstr "Relación: escollida"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
@@ -3977,6 +3993,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
@@ -4077,8 +4093,9 @@
 #: ../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
@@ -4148,5 +4165,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4156,5 +4173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4163,5 +4180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4170,5 +4187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4177,5 +4194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4184,5 +4201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4191,9 +4208,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4309,5 +4326,6 @@
 #, 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
@@ -4413,6 +4431,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
@@ -4422,5 +4440,6 @@
 #: ../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
@@ -4518,6 +4537,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4532,4 +4551,5 @@
 msgstr "Edición"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4693,6 +4713,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
@@ -4733,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:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4753,6 +4773,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
@@ -4772,11 +4792,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
@@ -4807,5 +4827,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"
@@ -4814,5 +4834,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"
@@ -4821,5 +4841,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"
@@ -5026,5 +5046,6 @@
 #: ../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
@@ -5050,5 +5071,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar os seus elementos escollidos ao final da lista de elementos misturados"
@@ -5078,6 +5100,7 @@
 msgstr "Copiar todos os seus elementos ao destino"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5089,5 +5112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Abaixo"
@@ -5132,6 +5155,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 "
@@ -5141,6 +5164,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 "
@@ -5197,9 +5220,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
@@ -5226,6 +5249,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 "
@@ -5245,5 +5268,9 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
+"Hay {0} primitiva adicional referida na relación a {1}<br>a cal está borrada "
+"no servidor.<br><br>Desexa recuperala tamén?"
 msgstr[1] ""
+"Hay {0} primitivas adicionais referidas nas relacións a {1}<br>as cales "
+"están borradas no servidor.<br><br>Desexa recuperalas tamén?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
@@ -5260,4 +5287,6 @@
 "elements when merge decisions are applied."
 msgstr ""
+"Propiedades no elemento misturado. Sustituirán as propiedades dos meus "
+"elementos cando se apliquen as decisións de misturar."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
@@ -5413,5 +5442,6 @@
 #, 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
@@ -5424,6 +5454,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5436,6 +5466,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5676,6 +5706,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5688,6 +5718,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
@@ -5701,9 +5731,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
@@ -5717,8 +5747,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>"
 
@@ -5738,6 +5768,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
@@ -5755,7 +5785,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 "
@@ -5785,5 +5815,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 "Descargar información sobre os conxuntos de cambios escollidos dende o "
@@ -5803,6 +5834,5 @@
 msgstr "Abre unha páxina web para cada conxunto de cambios escollido"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5827,5 +5857,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5833,5 +5863,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5908,16 +5938,17 @@
 #, 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
@@ -5934,13 +5965,13 @@
 msgstr "Resolver conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrar obxectos e agochaos/desactivaos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5949,45 +5980,41 @@
 msgstr "Engadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Engadir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Borrar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Subir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Baixar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Activar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Ocultar elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Aplicar tamen aos fillos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Invertir filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Modo de filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6146,5 +6173,6 @@
 #: ../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
@@ -6208,19 +6236,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419
 msgid "Call editor for relation"
-msgstr ""
+msgstr "Chamar o editor para a relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420
 msgid "Call relation editor for selected relation"
-msgstr ""
+msgstr "Chamar o editor para a relación escollida"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
-msgstr ""
+msgstr "Escoller na lista de relacións"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
-msgstr ""
+msgstr "Escoller relación an lista de relacións."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:495
@@ -6398,4 +6426,6 @@
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
 msgstr ""
+"Descarga as miñas modificacións do servidor OSM(100 conxuntos de cambios "
+"max.)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
@@ -6530,14 +6560,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
 msgid "Zoom to in layer"
-msgstr ""
+msgstr "Axustar á capa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding primitives in the current data layer"
 msgstr ""
+"Axustar a visulización das primitivas correspondentes na capa de datos actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:429
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Nada para ampliar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
@@ -6569,4 +6600,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7481,4 +7513,6 @@
 "layer"
 msgstr ""
+"Axustar a visualización na capa de datos actual ás primitivas contidas na "
+"modificación"
 
 #. parent for dialog is Main.parent
@@ -7537,4 +7571,5 @@
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
+"Escolle os conxuntos de cambios dependendo de quen as abrira ou pechara"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
@@ -7548,4 +7583,5 @@
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
+"Escoller só os conxuntos de cambios relativos a un recuadro de selección"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
@@ -7579,5 +7615,6 @@
 #: ../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
@@ -7667,4 +7704,6 @@
 "invalid."
 msgstr ""
+"Non se pode restrinxir a petición de este conxunto de cambios a un "
+"rectángulo delimitado. A entrada non é válida."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7676,5 +7715,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
+msgstr "Ventana de escolla inválida"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
@@ -7683,4 +7722,6 @@
 "The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
+"O valor actual non é unha ID válida de usuario. Introduza un valor enteiro "
+"maior que cero"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
@@ -7692,11 +7733,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
+msgstr "Introduza un nome de usuario non valeiro"
 
 #: ../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 ""
 
@@ -7710,5 +7751,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Descargar só as miñas modificacións"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7720,13 +7761,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>Descargar só os ultimos conxuntos de cambios</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:154
@@ -7735,8 +7776,11 @@
 "user name in the preferences first.</em></html>"
 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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
 msgid "<html>Download my open changesets</html>"
-msgstr ""
+msgstr "<html>Descargar os meus conxuntos de cambios abertos</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
@@ -7765,9 +7809,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
 msgid "Download changesets using predefined queries"
-msgstr ""
+msgstr "Descargar conxuntos de cambios usando consultas predefinidas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "Dende a URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
@@ -7779,5 +7823,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
@@ -7787,9 +7831,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Consultar conxuntos de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Consultar e descargar conxuntos de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
@@ -7799,5 +7843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "URL de consulta de conxuntos de cambios incorrecta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
@@ -7808,5 +7852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Consultando e descargando conxuntos de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
@@ -7820,5 +7864,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
@@ -7828,5 +7872,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
 msgid "Examples"
-msgstr ""
+msgstr "Exemplos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
@@ -7841,30 +7885,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+msgstr[0] "Modificarase {0} obxecto"
+msgstr[1] "Modificaranse {0} obxectos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+msgstr "Un valor vacío borra o atributo."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7873,5 +7917,5 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7880,78 +7924,82 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor selecciona os obxectos dos que queres cambiar as propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+msgstr "Propiedades/Relacións"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 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:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -8066,6 +8114,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 ""
 
@@ -8083,6 +8131,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 ""
 
@@ -8237,6 +8285,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8573,6 +8622,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8632,4 +8682,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8712,6 +8763,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 ""
 
@@ -8721,6 +8772,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 ""
 
@@ -9003,8 +9054,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>A actualización <strong>fallou</strong> porque o servidor ten unha "
@@ -9027,7 +9079,8 @@
 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 "
@@ -9268,5 +9321,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9283,5 +9336,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9366,6 +9420,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] ""
@@ -9379,6 +9433,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 "
@@ -9604,5 +9658,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9628,5 +9682,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9681,6 +9736,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 ""
 
@@ -9734,7 +9789,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 ""
 
@@ -9744,5 +9799,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9767,5 +9822,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9983,7 +10039,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 ""
 
@@ -10009,7 +10065,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 ""
 
@@ -10073,6 +10129,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>A subida de datos GPS sen procesar como datos de mapa considerase "
@@ -10088,5 +10144,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10256,6 +10312,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 ""
 
@@ -10315,7 +10371,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 ""
 
@@ -10380,64 +10436,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10447,20 +10507,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10469,5 +10529,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10475,21 +10535,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10497,17 +10557,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10516,5 +10576,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10565,14 +10625,14 @@
 msgstr "Erro obtendo ficheiros do directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10581,5 +10641,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10588,10 +10648,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10600,5 +10660,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10888,6 +10948,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 ""
 
@@ -10909,8 +10969,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 ""
 
@@ -11030,6 +11090,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 ""
 
@@ -11139,5 +11199,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11271,8 +11332,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 ""
 
@@ -11355,8 +11416,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 ""
 
@@ -11383,7 +11444,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 ""
 
@@ -11455,36 +11516,32 @@
 msgstr "Amosar traza de audio en directo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Crear marcas non auditivas ó ler GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Puntos de vía explícitos con marcas de tempo válidas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Puntos de vía explícitos con hora estimada da posición da traza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Puntos de trazado nomeados."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Horas modificadas (marcas de tempo) de ficheiros de audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 "Inicio de traza (facer sempre isto se non existen outras marcas dispoñibles)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 "Amosar ou ocultar a entrada do menú de audio da barra de menú principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11494,5 +11551,5 @@
 "onde o audio que se está a reproducir foi grabado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11502,23 +11559,16 @@
 "ás súas iconas de botón."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Crear automáticamente unha capa de marcas desde calquer punto de vía cando "
-"se abra unha capa GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Cando se importe audio, crear marcas desde..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Cando se importe audio, aplicalo a calquera punto de vía na capa GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11528,5 +11578,5 @@
 "lugar dos puntos de vía explícitos) con nomes ou descripcións."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11536,5 +11586,5 @@
 "modificada de cada ficheiro de audio WAV importado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11544,17 +11594,17 @@
 "pertinente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Tempo de avance/retroceso (segundos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "A cantidade pola que se multiplicará a velocidade para avance rápido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Multiplicador de avance rápido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11564,9 +11614,9 @@
 "negativo) da posición requerida da pista de audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Tempo de introducción (segundos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
@@ -11574,5 +11624,5 @@
 "transcurrido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Calibración do grabador de voz"
@@ -11612,5 +11662,5 @@
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11621,34 +11671,34 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Ningún"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Forzar liñas se non se importou ningún segmento."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Debuxar puntos GPS grandes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermello = lento, verde = rápido)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -11656,5 +11706,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11676,5 +11726,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11716,5 +11766,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11728,16 +11778,16 @@
 msgstr "Pé"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Debuxar Frechas de Dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Debuxo rápido (peor resultado)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11746,34 +11796,46 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Só no extremo da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Debuxar os números de orde dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Debuxar os límites dos datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Debuxar nodos virtuais no modo de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Debuxar as capas inactivas en outra cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos de mapa suaves (filtro antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Crear automáticamente unha capa de marcas desde calquer punto de vía cando "
+"se abra unha capa GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Debuxar liñas entre puntos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11783,9 +11845,9 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Lonxitude máxima para os arquivos locais (metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11794,10 +11856,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Lonxitude máxima (metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11806,11 +11868,12 @@
 "de liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Debuxar as frechas de dirección usando búsquedas nas táboas en lugar de "
@@ -11818,5 +11881,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11826,13 +11889,13 @@
 "da anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima (pixeles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11842,9 +11905,9 @@
 "personalizados no Xestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11852,29 +11915,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Coloreado de Trazados e Puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Debuxar consellos de dirección para segmentos de vía."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Aplicar filtros antialiasing á vista do mapa para acadar unha apariencia "
@@ -11882,10 +11946,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11894,9 +11958,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Debuxar as capas de datos inactivas nunha cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -11968,5 +12032,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12015,6 +12080,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -12091,6 +12156,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 ""
 
@@ -12103,9 +12168,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 ""
 
@@ -12128,6 +12193,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
@@ -12406,6 +12471,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 ""
 
@@ -12527,6 +12592,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 ""
 
@@ -12548,6 +12613,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 ""
 
@@ -12626,5 +12691,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12640,5 +12706,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12732,6 +12799,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 ""
 
@@ -13027,5 +13094,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
@@ -13173,5 +13240,6 @@
 #: ../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
@@ -13210,5 +13278,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13481,5 +13550,6 @@
 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
@@ -13510,6 +13580,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
@@ -13604,9 +13674,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
@@ -13633,6 +13703,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 ""
 
@@ -13677,5 +13747,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "Valor ilegal para o atributo \"ref\" no membro na relación {0}.Obtívose {1}"
@@ -13694,6 +13765,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
@@ -14026,6 +14097,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
@@ -14050,5 +14121,6 @@
 "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
@@ -14121,6 +14193,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
@@ -14141,17 +14213,22 @@
 #, 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>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"JOSM é {2}.<br>É preciso que se actualice JOSM para usar este "
+"complemento.</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "cargando complemento \"{0}\" (version {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14162,29 +14239,25 @@
 "class \"{1}\" non se atopou.<br>Borrar das preferencias?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Cargando complementos..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Comprobando as condicións previas do complemento..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Cargando complemento ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
 msgstr[0] "JOSM non puido atopar información sobre o complemento seguinte:"
-msgstr[1] "JOSM non puido atopar información sobre os complementos seguintes:"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+msgstr[1] ""
+"JOSM non puido atopar información sobre os complementos seguintes:"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14192,17 +14265,17 @@
 msgstr[1] "Os complementos non van a ser cargados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Determinando complementos a cargar..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Eliminando complementos obsoletos..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Eliminando complementos non mantidos..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14210,5 +14283,5 @@
 msgstr[1] "A actualización dos seguintes complementos fallaron"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14224,42 +14297,42 @@
 "intenta actualizalos manualmente."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Fallou a actualización do complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Atención: fallou ao descargar  a lista de información do complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Desactivar engadido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Prema para borrar o complemento \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Manter complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Premer para manter o complemento \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Atención: fallou ao eliminar o complemento obsoleto \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14268,5 +14341,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14277,22 +14350,22 @@
 "descargado \"{1}\".Fallou ao renomear."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Prema para deshabilitar o complemento \"{0}\""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dacordo coa información contida no engadido, o autor é {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14301,9 +14374,9 @@
 "dun fallo."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Debería ser desactivado o engadido?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14313,14 +14386,14 @@
 "descargar o complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Información do complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "sen descripción dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14363,5 +14436,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14423,5 +14497,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"
@@ -14504,17 +14578,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 ""
 
@@ -14522,7 +14596,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 ""
 
@@ -14530,8 +14604,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 ""
 
@@ -14551,7 +14625,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 ""
 
@@ -14620,6 +14694,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14631,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 ""
 
@@ -14663,9 +14738,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15339,7 +15414,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15349,5 +15424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15357,5 +15432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15371,5 +15446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15379,5 +15454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15408,5 +15483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15415,5 +15490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15422,5 +15497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15429,5 +15504,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15436,5 +15511,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15443,5 +15518,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15475,10 +15550,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15960,34 +16036,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -16060,5 +16137,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16149,4 +16226,5 @@
 msgstr "Porto:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16360,5 +16438,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16479,5 +16557,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16496,6 +16575,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16723,5 +16803,6 @@
 #: ../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
@@ -16801,5 +16882,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "A cabeceira conten varios valores que non poden ser mapeados en unha soa "
@@ -16911,5 +16993,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16960,5 +17043,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17775,4 +17859,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18219,6 +18311,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 +18396,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 +18451,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 +18564,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 +18571,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 ""
 
@@ -19113,6 +19205,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -19260,5 +19353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19358,5 +19451,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19731,9 +19824,6 @@
 msgstr "Arquivos WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19744,10 +19834,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "A base de datos esta fora de liña por mantemento"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19755,25 +19845,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr ""
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Dispositivo de audio non dispoñible"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Debe facer publico as tuas edicións para subir novos datos"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr "cidade"
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19781,17 +19871,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "plantación forestal"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19799,7 +19889,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19809,5 +19899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19850,5 +19940,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19858,5 +19948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19866,5 +19956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19874,8 +19964,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19889,5 +19979,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19898,5 +19988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19905,7 +19995,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19915,5 +20005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19923,5 +20013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19931,5 +20021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19939,5 +20029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19947,5 +20037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19955,5 +20045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19963,8 +20053,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19974,59 +20064,60 @@
 msgstr "ruta"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Atributos Opcionais:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "sen modificador"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nome de usuario:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Escaleira de paso"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Tipos de combustible:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Páxina de incio"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoista"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Aumentar Zoom"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Novo papel"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Crear novo nodo."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Gardar"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20098,5 +20189,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -20265,6 +20357,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20273,5 +20372,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20282,10 +20381,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 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:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20296,5 +20395,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20304,5 +20403,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20313,5 +20412,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -20319,10 +20418,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20333,5 +20432,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21221,7 +21320,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21361,8 +21460,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"/>
@@ -21572,5 +21671,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21580,5 +21679,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21597,5 +21696,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21605,5 +21704,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21622,5 +21721,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21630,5 +21729,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21647,5 +21746,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21655,5 +21754,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21668,5 +21767,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21684,5 +21783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21700,5 +21799,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21707,5 +21806,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21715,5 +21814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21733,5 +21832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21740,5 +21839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21748,5 +21847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22450,5 +22549,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22499,5 +22598,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22545,5 +22644,6 @@
 #: 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"
@@ -22594,5 +22694,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22760,5 +22860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23092,5 +23192,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23100,5 +23200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23108,5 +23208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23116,5 +23216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23124,5 +23224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23132,5 +23232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23140,5 +23240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23149,5 +23249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24567,5 +24667,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24575,5 +24675,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24583,5 +24683,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24591,5 +24691,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24953,7 +25053,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24963,5 +25063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24971,5 +25071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24979,5 +25079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24987,5 +25087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24995,5 +25095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25003,5 +25103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25011,5 +25111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25019,5 +25119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25027,5 +25127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25035,5 +25135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25043,5 +25143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25051,5 +25151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25059,5 +25159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25067,5 +25167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25075,5 +25175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25083,5 +25183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25091,5 +25191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25099,5 +25199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25107,5 +25207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25115,5 +25215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25123,5 +25223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25131,5 +25231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25139,5 +25239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25147,5 +25247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25155,5 +25255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25163,5 +25263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25171,5 +25271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25179,5 +25279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25187,5 +25287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25195,5 +25295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25203,5 +25303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25211,5 +25311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25219,5 +25319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25227,5 +25327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25235,5 +25335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25243,5 +25343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25251,5 +25351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25259,5 +25359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25267,5 +25367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25275,5 +25375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25283,5 +25383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25291,5 +25391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25299,5 +25399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25307,5 +25407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25315,5 +25415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25323,5 +25423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27027,7 +27127,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27037,5 +27137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27045,5 +27145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27053,5 +27153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27061,5 +27161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27069,5 +27169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27077,5 +27177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27085,5 +27185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27093,5 +27193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28514,5 +28614,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28528,5 +28628,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28536,5 +28636,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28545,5 +28645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28556,7 +28656,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28566,5 +28666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28574,5 +28674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28582,5 +28682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28590,5 +28690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28622,5 +28722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28636,5 +28736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28644,5 +28744,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28651,5 +28751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28659,5 +28759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28668,5 +28768,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28691,5 +28791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28804,9 +28904,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
@@ -28814,5 +28914,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,
@@ -28822,8 +28922,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
@@ -28837,5 +28937,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28843,5 +28943,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28890,6 +28990,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>
@@ -28969,5 +29069,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28977,11 +29077,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28997,5 +29097,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29004,5 +29104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29011,5 +29111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29025,5 +29125,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29037,5 +29137,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29044,5 +29144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29051,5 +29151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29058,5 +29158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29065,5 +29165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29072,5 +29172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29079,5 +29179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29086,5 +29186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29093,5 +29193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29100,5 +29200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29107,5 +29207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29114,5 +29214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29121,5 +29221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29128,5 +29228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29135,5 +29235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29310,7 +29410,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29324,5 +29424,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29332,7 +29432,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29342,5 +29442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29350,5 +29450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29358,5 +29458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29366,5 +29466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29380,5 +29480,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29387,5 +29487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29395,5 +29495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29402,5 +29502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29409,5 +29509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29416,5 +29516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29423,5 +29523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29430,5 +29530,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29437,5 +29537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29444,5 +29544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29451,5 +29551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29458,5 +29558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29470,5 +29570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29482,5 +29582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29489,5 +29589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29501,5 +29601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29514,5 +29614,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29527,5 +29627,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29539,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29551,5 +29651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29558,5 +29658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29565,5 +29665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29573,5 +29673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29580,5 +29680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29587,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29594,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29602,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29611,5 +29711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29619,7 +29719,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29629,5 +29729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29637,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29645,5 +29745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29654,5 +29754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29661,5 +29761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29669,5 +29769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29677,5 +29777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29685,5 +29785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29693,5 +29793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29701,5 +29801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29709,5 +29809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29717,5 +29817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29725,5 +29825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29733,5 +29833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29754,5 +29854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29767,7 +29867,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29777,5 +29877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29784,5 +29884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29792,5 +29892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29799,5 +29899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29807,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29815,5 +29915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29829,5 +29929,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29838,5 +29938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29855,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29863,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29874,5 +29974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29891,5 +29991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29898,5 +29998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29905,5 +30005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29912,7 +30012,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29923,5 +30023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29936,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29948,5 +30048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29956,5 +30056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29968,5 +30068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29980,5 +30080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29987,5 +30087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29994,7 +30094,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30004,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30012,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30020,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30028,5 +30128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30036,5 +30136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30050,7 +30150,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30065,5 +30165,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30078,5 +30178,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30091,5 +30191,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30104,5 +30204,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30117,5 +30217,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30130,7 +30230,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30140,5 +30240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30147,5 +30247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30155,5 +30255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30163,5 +30263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30171,5 +30271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30179,5 +30279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30187,5 +30287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30195,5 +30295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30203,5 +30303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30211,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30219,5 +30319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30227,5 +30327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30235,5 +30335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30253,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30266,5 +30366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30277,7 +30377,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30287,5 +30387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30295,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30303,5 +30403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30311,5 +30411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30319,5 +30419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30327,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30335,5 +30435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30343,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30351,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30359,5 +30459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30367,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30375,5 +30475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30383,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30391,5 +30491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30399,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30407,5 +30507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30427,5 +30527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30439,7 +30539,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30449,5 +30549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30457,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30465,5 +30565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30473,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30481,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30489,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30497,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30505,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30513,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30521,5 +30621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30538,5 +30638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30546,5 +30646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30554,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30562,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30570,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30578,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30586,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30594,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30602,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30610,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30618,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30626,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30643,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30650,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30658,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30665,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30673,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30681,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30689,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30696,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30704,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30712,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30720,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30728,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30735,5 +30835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30742,5 +30842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30749,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30756,5 +30856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30763,5 +30863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30770,5 +30870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30777,5 +30877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30784,5 +30884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30791,5 +30891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30798,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30805,5 +30905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30812,5 +30912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30819,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30827,5 +30927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30835,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30843,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30851,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30859,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30867,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30875,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30883,5 +30983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30891,5 +30991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30900,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30908,5 +31008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30916,5 +31016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30924,5 +31024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30932,5 +31032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30940,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30948,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30956,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30964,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30972,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30980,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30988,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30996,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31004,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31012,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31020,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31028,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31036,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31044,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31052,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31059,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31089,5 +31189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31097,5 +31197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31105,7 +31205,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31120,5 +31220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31128,5 +31228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31136,5 +31236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31144,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31152,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31160,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31168,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31182,7 +31282,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31192,5 +31292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31200,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31208,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31216,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31224,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31232,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31240,5 +31340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31248,5 +31348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31256,5 +31356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31264,5 +31364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31272,5 +31372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31280,5 +31380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31288,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31296,5 +31396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31304,5 +31404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31312,5 +31412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31320,5 +31420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31328,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31336,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31344,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31352,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31360,5 +31460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31368,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31376,5 +31476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31384,5 +31484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31392,5 +31492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31400,5 +31500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31408,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31416,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31424,5 +31524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31432,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31440,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31448,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31456,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31464,5 +31564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31472,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31480,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31488,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31496,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31504,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31512,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31520,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31554,7 +31654,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31564,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31572,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31580,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31588,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31596,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31604,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31612,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31627,5 +31727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31635,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31643,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31651,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31659,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31667,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31676,5 +31776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31684,5 +31784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31692,5 +31792,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31700,5 +31800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31707,5 +31807,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31714,5 +31814,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31730,7 +31830,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31740,5 +31840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31748,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31756,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31764,5 +31864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31772,5 +31872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31780,5 +31880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31788,5 +31888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31796,5 +31896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31804,5 +31904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31820,5 +31920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31832,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31844,5 +31944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31852,5 +31952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31864,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31876,6 +31976,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31885,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31897,5 +31997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31909,5 +32009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31921,5 +32021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31933,5 +32033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31945,5 +32045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31953,7 +32053,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31963,5 +32063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31971,5 +32071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31979,5 +32079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31987,5 +32087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32002,5 +32102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32013,5 +32113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32025,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32037,5 +32137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32049,5 +32149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32058,5 +32158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32066,5 +32166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32074,5 +32174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32082,5 +32182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32090,5 +32190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32105,5 +32205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32117,5 +32217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32129,5 +32229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32141,5 +32241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32153,5 +32253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32166,5 +32266,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?
@@ -32190,5 +32290,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32199,11 +32299,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32213,5 +32313,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32221,5 +32321,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32229,5 +32329,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32237,5 +32337,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32245,5 +32345,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32253,5 +32353,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32261,5 +32361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32269,5 +32369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32277,5 +32377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32285,5 +32385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32293,5 +32393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32301,5 +32401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32319,5 +32419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32412,5 +32512,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32418,28 +32518,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
@@ -32554,5 +32654,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32565,5 +32665,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>
@@ -32588,6 +32688,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32596,6 +32696,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32610,6 +32710,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
@@ -32623,6 +32723,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
@@ -32642,6 +32742,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32665,6 +32765,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
@@ -32696,4 +32796,5 @@
 #~ 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"
@@ -32760,4 +32861,5 @@
 #~ msgstr "Mover cara abaixo"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor de Relación: {0}"
@@ -32773,10 +32875,11 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
-#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á "
-#~ "versión seleccionada na lista do historial."
-
+#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á versión "
+#~ "seleccionada na lista do historial."
+
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
@@ -32785,4 +32888,5 @@
 #~ msgstr "Borrar a capa seleccionada."
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pila de Comandos: {0}"
@@ -32794,7 +32898,9 @@
 #~ 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}"
@@ -32805,4 +32911,5 @@
 #~ msgstr[1] "imaxes"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro da traza."
@@ -32859,19 +32966,19 @@
 #~ msgstr "Contrasinal do servidor proxy"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Crear marcas non auditivas ó ler GPX."
+
 #~ msgid "Set the language."
 #~ msgstr "Establecer o idioma."
 
 #~ 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"
@@ -32890,10 +32997,13 @@
 #~ 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"
@@ -32905,7 +33015,9 @@
 #~ 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}\""
@@ -32927,4 +33039,5 @@
 #~ msgstr "ID de nodo mal formada"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32936,14 +33049,16 @@
 #~ " {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}."
@@ -32954,13 +33069,14 @@
 #~ 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'.)"
-
+#~ "advertencia<br>establecendoos coa opción de configuración "
+#~ "'pluginmanager.warntime'.)"
+
+#, java-format
 #~ 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 "
@@ -32971,6 +33087,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"
@@ -32983,4 +33099,5 @@
 #~ msgstr "Borrar e Descargar"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33000,7 +33117,9 @@
 #~ 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}\"."
@@ -33014,6 +33133,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)"
@@ -33047,4 +33166,5 @@
 #~ 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}"
@@ -33060,6 +33180,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"
@@ -33068,6 +33188,5 @@
 #~ 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"
@@ -33084,10 +33203,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?"
-
+#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha capa "
+#~ "de datos?"
+
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33106,7 +33225,12 @@
 #~ msgstr "Capa de datos"
 
+#~ msgid "Errors during Download"
+#~ 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}\""
@@ -33116,21 +33240,22 @@
 
 #~ 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."
-
+#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. Por "
+#~ "favor, informa disto como un erro."
+
+#, java-format
 #~ 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"
@@ -33143,4 +33268,5 @@
 #~ msgstr "Mover"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Non se pode abrir o directorio de preferencias: {0}"
@@ -33155,7 +33281,9 @@
 #~ msgstr "verdadeiro"
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "a vía multipoligonal \"{0}\" non está pechada."
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Vía \"{0}\" con menos de dous puntos."
@@ -33164,10 +33292,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."
@@ -33188,4 +33319,5 @@
 #~ msgstr "Abrir imaxes con AgPifoJ..."
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Comprobando se o nodo {0} falta ..."
@@ -33194,26 +33326,27 @@
 #~ 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>"
-
+#~ "<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
 #~ 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 "
@@ -33233,4 +33366,5 @@
 #~ msgstr "Actualizando primitiva"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33239,6 +33373,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"
@@ -33254,11 +33388,13 @@
 #~ 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"
-
+#~ "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
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorrecto do operador id: {0}. Espérase un número."
@@ -33273,4 +33409,5 @@
 #~ msgstr "vías"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Solucionar {0} conflitos en {1} obxectos"
@@ -33279,4 +33416,5 @@
 #~ msgstr "Combinando conflitos"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33294,23 +33432,29 @@
 #~ "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>."
-
+#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A "
+#~ "HREF=\"{1}\">galego</A>."
+
+#, java-format
 #~ 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}\""
@@ -33322,4 +33466,5 @@
 #~ 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}"
@@ -33331,15 +33476,27 @@
 #~ msgstr "non se atopou a última versión. O historial está valeiro."
 
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ 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 ""
 #~ "<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"
+#~ msgstr "Aplicar tamen aos fillos"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/he.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:47+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 13:03+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -260,6 +260,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -314,6 +314,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 ""
 
@@ -337,9 +337,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
@@ -430,6 +430,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -640,12 +640,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1430,5 +1430,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1449,5 +1450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1598,5 +1599,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים"
 
@@ -1618,5 +1620,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1816,5 +1818,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או"
 
@@ -1880,9 +1883,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)"
@@ -1899,5 +1902,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2187,7 +2190,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "שגיאות במהלך הורדה"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2221,6 +2224,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2353,6 +2356,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+שחרור "
@@ -2473,68 +2476,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "חפש..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "חיפוש אחר פריטים."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "נא הזן מחרוזת לחיפוש."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "החלפת הבחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "הוספה לבחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "הסר מהבחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "רגיש להבדל בין אותיות גדולות וקטנות"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "ביטוי רגולרי"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>רחוב אבג</b>-''רחוב'' ו''אבג'' בכל מפתח או שם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"רחוב אבג\"</b>-''רחוב אבג'' בכל מפתח או שם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:אבג</b>-''אבג'' איפשהו בשם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b>-מפתח ''type'' עם הערך ''route'' במדוייק."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2544,38 +2547,38 @@
 "<b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:אבג</b>-ללא ''אבג'' בשם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b>-מפתח ''foot'' עם כל ערך."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>מטרות מיוחדות:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b>-סוג העצם (<b>נקודה</b>, <b>דרך</b>, <b>יחס</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>...-כל העצמים ששונו ע\"י המשתמש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2583,5 +2586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2589,11 +2592,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2601,5 +2604,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2607,39 +2614,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b>...- כל העצמים ששונו"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - כל העצמים הבחורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - כל העצמים הבלתי גמורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - כל העצמים הלא מתוייגים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "השתמש ב-<b>|</b> או <b>OR</b> כדי לחבר ב\"או\" לוגי"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2647,11 +2654,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "השתמש ב-<b>(</b> ו <b>)</b> כדי לצרף ביטויים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2659,38 +2666,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "חפש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "התחל חיפוש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "לא נמצאה התאמה עבור \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2698,5 +2705,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2704,5 +2711,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2710,5 +2717,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2726,50 +2733,53 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2833,5 +2843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3039,7 +3049,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>זה עלול לגרום לבעיות כיוון שעצמים "
@@ -3302,6 +3312,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 ""
 
@@ -3384,5 +3394,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3391,5 +3401,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3398,5 +3408,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3433,5 +3443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3484,5 +3494,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3490,5 +3500,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3496,17 +3506,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "טקסט"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3514,5 +3518,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3521,5 +3525,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3527,5 +3531,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3533,5 +3537,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3539,42 +3543,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3583,5 +3587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3589,5 +3593,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3643,5 +3647,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3651,81 +3656,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "יותר מ-\"to\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "יותר מ-\"via\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
 msgid "No \"from\" way found."
 msgstr "אף דרך \"from\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "אף דרך \"to\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "שגיאה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3899,5 +3904,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3968,5 +3974,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3976,5 +3982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3983,5 +3989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3990,5 +3996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3997,5 +4003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4004,5 +4010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4011,9 +4017,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4330,6 +4336,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4344,4 +4350,5 @@
 msgstr "ערוך"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4534,5 +4541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4571,6 +4578,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 ""
 
@@ -4601,5 +4608,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"
@@ -4608,5 +4615,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"
@@ -4615,5 +4622,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"
@@ -4831,5 +4838,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים"
 
@@ -4858,6 +4866,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4869,5 +4878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "מטה"
@@ -4912,6 +4921,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 ""
 
@@ -4919,6 +4928,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 ""
 
@@ -4969,6 +4978,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 ""
 
@@ -5185,6 +5194,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5197,6 +5206,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5494,7 +5503,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 ""
 
@@ -5519,5 +5528,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5535,6 +5545,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5558,5 +5567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5564,5 +5573,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5635,9 +5644,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5655,13 +5665,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5670,45 +5680,41 @@
 msgstr "הוסף"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5935,10 +5941,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -5976,5 +5982,6 @@
 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
@@ -6279,4 +6286,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7390,6 +7398,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 ""
 
@@ -7413,8 +7421,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 ""
 
@@ -7534,5 +7542,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7541,23 +7549,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "לשנות ערכים?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7566,5 +7574,5 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7573,77 +7581,81 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "נא בחר ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "תכונות\\חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "תכונות לעצמים שנבחרו."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "חבר ב"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7758,6 +7770,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 ""
 
@@ -7775,6 +7787,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 ""
 
@@ -7929,6 +7941,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8261,6 +8274,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8320,4 +8334,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8400,6 +8415,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 ""
 
@@ -8409,6 +8424,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 ""
 
@@ -8682,8 +8697,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8698,7 +8714,8 @@
 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 ""
 
@@ -8934,5 +8951,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8949,5 +8966,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9032,6 +9050,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] ""
@@ -9045,6 +9063,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 "
@@ -9270,5 +9288,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9294,5 +9312,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9347,6 +9366,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 ""
 
@@ -9400,7 +9419,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 ""
 
@@ -9410,5 +9429,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9433,5 +9452,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9649,7 +9669,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 ""
 
@@ -9675,7 +9695,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 ""
 
@@ -9739,6 +9759,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.<br>אם אתה רוצה להעלות "
@@ -9754,5 +9774,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9805,6 +9825,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:1126
@@ -9920,6 +9940,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 ""
 
@@ -9979,7 +9999,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 ""
 
@@ -10044,64 +10064,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "אזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "היסט:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "אזור זמן שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "היסט שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10111,20 +10135,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10133,5 +10157,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10139,21 +10163,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10161,17 +10185,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10182,5 +10206,5 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10233,14 +10257,14 @@
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10249,5 +10273,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10256,10 +10280,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10268,5 +10292,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10554,6 +10578,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 ""
 
@@ -10575,8 +10599,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 ""
 
@@ -10696,6 +10720,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 ""
 
@@ -10805,5 +10829,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10937,8 +10962,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 ""
 
@@ -11021,8 +11046,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 ""
 
@@ -11049,7 +11074,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 ""
 
@@ -11120,34 +11145,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11155,5 +11176,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11161,21 +11182,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "בזמן ייבוא שמע, צור סמנים מ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11183,5 +11198,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11189,5 +11204,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11195,17 +11210,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11213,13 +11228,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "כיול רשם קול"
@@ -11259,5 +11274,5 @@
 msgstr "צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11268,34 +11283,34 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "הכרח קווים במידה ולא יובאו מקטעים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "צייר נקודות GPS גדולות."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Velocity (red = slow, green = fast)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
-msgid "Velocity (red = slow, green = fast)"
+msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11303,5 +11318,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11323,5 +11338,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11363,5 +11378,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11375,50 +11390,60 @@
 msgstr "רגל"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "צייר חיצי כיוון"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "ציור מהיר (נראה מכוער יותר)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "רק בראשית הדרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "צייר מספרים סידוריים של קטע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "צייר גבולות של נתונים שהורדו"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "צייר נקודות וירטואליות במצב הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "צייר שכבות לא פעילות בצבע שונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "החלק גרפיקה של מפה (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11426,34 +11451,35 @@
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "אורך מירבי (מטרים)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11461,13 +11487,13 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "מרחק מינימלי (פיקסלים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11475,9 +11501,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11485,46 +11511,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "נקודות GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "צייר רמזי כיוון עבור קטעי דרך."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "צייר את גבולות המידע שמורד מהשרת."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "נתוני OSM"
@@ -11596,5 +11623,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11643,6 +11671,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11719,6 +11747,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 ""
 
@@ -11731,9 +11759,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 ""
 
@@ -12030,6 +12058,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 ""
 
@@ -12151,6 +12179,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 ""
 
@@ -12172,6 +12200,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 ""
 
@@ -12249,5 +12277,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12263,5 +12292,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12355,6 +12385,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 ""
 
@@ -12650,5 +12680,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
@@ -12831,5 +12861,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13214,6 +13245,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 ""
 
@@ -13241,6 +13272,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 ""
 
@@ -13282,5 +13313,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13710,14 +13742,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13726,23 +13763,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13750,5 +13782,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13756,17 +13788,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13774,5 +13806,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13784,42 +13816,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "נטרל תוסף"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13828,5 +13860,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13835,10 +13867,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -13846,19 +13878,19 @@
 msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "לפי המידע בתוסף, המחבר הוא {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "האם התוסף צריך ליהיות מנוטרל?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13866,14 +13898,14 @@
 msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "אין תיאור זמין"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13914,5 +13946,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13974,5 +14007,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"
@@ -14055,6 +14088,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 ""
 
@@ -14062,7 +14095,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 ""
 
@@ -14070,7 +14103,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 ""
 
@@ -14078,8 +14111,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 ""
 
@@ -14099,7 +14132,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 ""
 
@@ -14168,6 +14201,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14179,7 +14213,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 ""
 
@@ -14211,9 +14245,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14876,7 +14910,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14886,5 +14920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14894,5 +14928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14908,5 +14942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14916,5 +14950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -14945,5 +14979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -14952,5 +14986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -14959,5 +14993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -14966,5 +15000,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -14973,5 +15007,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -14980,5 +15014,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15012,10 +15046,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15489,34 +15524,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "שימוש"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "סכמת צבעים"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "בחר סכמה למחיקה."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "השתמש בסכמה הנבחרת מהרשימה."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "השתמש בצבעים הנוכחיים כסכמת הצבעים החדשה"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "מחק את הסכמה הנבחרת מהרשימה"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "סכמות צבעים"
@@ -15589,5 +15625,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15678,4 +15714,5 @@
 msgstr "פורט:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15885,5 +15922,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16004,5 +16041,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16022,6 +16060,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "הדיוק של פישוט קו דאגלס-פאוקר, נמדד במעלות. <br>ערכים נמוכים נותנים יותר "
@@ -16329,5 +16368,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -16437,5 +16477,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16487,5 +16528,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17303,4 +17345,12 @@
 msgstr "מדרג"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17745,6 +17795,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 ""
 
@@ -17830,8 +17880,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 ""
 
@@ -17885,8 +17935,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 ""
 
@@ -17998,6 +18048,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 ""
 
@@ -18005,6 +18055,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 ""
 
@@ -18641,6 +18691,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18787,5 +18838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18885,5 +18936,5 @@
 msgstr "{0},..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19258,23 +19309,20 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
 "area, or use planet.osm"
 msgstr ""
-"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב planet."
-"osm"
+"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב "
+"planet.osm"
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "בסיס הנתונים לא מקוון לצורך תחזוקה"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19282,25 +19330,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "לא יכול לקבל קלט שמע מכתובת הקלט"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr ""
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19308,17 +19356,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "יער"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19326,7 +19374,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19336,5 +19384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19377,5 +19425,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19385,5 +19433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19393,5 +19441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19401,8 +19449,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19416,5 +19464,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19425,5 +19473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19432,7 +19480,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19442,5 +19490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19450,5 +19498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19458,5 +19506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19466,5 +19514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19474,5 +19522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19482,5 +19530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19490,8 +19538,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19501,57 +19549,60 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "מאפייני רשות:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
 msgid "Modified"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "שם אמיתי"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "דוקרנים"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "דף הבית"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "טאואיסט"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "מיקוד צפיה"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "תפקיד חדש"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "יוצר נקודה חדשה."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "שמירה"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19622,5 +19673,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19786,6 +19838,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19794,5 +19853,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19801,10 +19860,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19813,5 +19872,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19821,5 +19880,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19828,15 +19887,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19845,5 +19904,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20733,7 +20792,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20873,8 +20932,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"/>
@@ -21084,5 +21143,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21092,5 +21151,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21109,5 +21168,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21117,5 +21176,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21134,5 +21193,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21142,5 +21201,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21159,5 +21218,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21167,5 +21226,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21180,5 +21239,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21196,5 +21255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21212,5 +21271,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21219,5 +21278,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21227,5 +21286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21245,5 +21304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21252,5 +21311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21260,5 +21319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21962,5 +22021,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22011,5 +22070,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22106,5 +22165,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22272,5 +22331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22604,5 +22663,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22612,5 +22671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22620,5 +22679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22628,5 +22687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22636,5 +22695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22644,5 +22703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22652,5 +22711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22661,5 +22720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24079,5 +24138,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24087,5 +24146,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24095,5 +24154,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24103,5 +24162,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24465,7 +24524,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24475,5 +24534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24483,5 +24542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24491,5 +24550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24499,5 +24558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24507,5 +24566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24515,5 +24574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24523,5 +24582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24531,5 +24590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24539,5 +24598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24547,5 +24606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24555,5 +24614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24563,5 +24622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24571,5 +24630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24579,5 +24638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24587,5 +24646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24595,5 +24654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24603,5 +24662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24611,5 +24670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24619,5 +24678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24627,5 +24686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24635,5 +24694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24643,5 +24702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24651,5 +24710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24659,5 +24718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24667,5 +24726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24675,5 +24734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24683,5 +24742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24691,5 +24750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24699,5 +24758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24707,5 +24766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24715,5 +24774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24723,5 +24782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24731,5 +24790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24739,5 +24798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24747,5 +24806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24755,5 +24814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24763,5 +24822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24771,5 +24830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24779,5 +24838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24787,5 +24846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24795,5 +24854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24803,5 +24862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24811,5 +24870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24819,5 +24878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24827,5 +24886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24835,5 +24894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26539,7 +26598,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26549,5 +26608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26557,5 +26616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26565,5 +26624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26573,5 +26632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26581,5 +26640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26589,5 +26648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26597,5 +26656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26605,5 +26664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28026,5 +28085,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28040,5 +28099,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28048,5 +28107,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28057,5 +28116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28068,7 +28127,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28078,5 +28137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28086,5 +28145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28094,5 +28153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28102,5 +28161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28134,5 +28193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28148,5 +28207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28156,5 +28215,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28163,5 +28222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28171,5 +28230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28180,5 +28239,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28203,5 +28262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28316,9 +28375,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
@@ -28326,5 +28385,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,
@@ -28334,8 +28393,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
@@ -28349,5 +28408,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28355,5 +28414,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28402,6 +28461,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>
@@ -28481,5 +28540,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28489,11 +28548,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28509,5 +28568,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28516,5 +28575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28523,5 +28582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28537,5 +28596,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28549,5 +28608,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28556,5 +28615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28563,5 +28622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28570,5 +28629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28577,5 +28636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28584,5 +28643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28591,5 +28650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28598,5 +28657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28605,5 +28664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28612,5 +28671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28619,5 +28678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28626,5 +28685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28633,5 +28692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28640,5 +28699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28647,5 +28706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28822,7 +28881,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28836,5 +28895,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28844,7 +28903,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28854,5 +28913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28862,5 +28921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28870,5 +28929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28878,5 +28937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28892,5 +28951,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28899,5 +28958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28907,5 +28966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -28914,5 +28973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -28921,5 +28980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -28928,5 +28987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -28935,5 +28994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -28942,5 +29001,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -28949,5 +29008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -28956,5 +29015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -28963,5 +29022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -28970,5 +29029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -28982,5 +29041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -28994,5 +29053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29001,5 +29060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29013,5 +29072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29026,5 +29085,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29039,5 +29098,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29051,5 +29110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29063,5 +29122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29070,5 +29129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29077,5 +29136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29085,5 +29144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29092,5 +29151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29099,5 +29158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29106,5 +29165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29114,5 +29173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29123,5 +29182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29131,7 +29190,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29141,5 +29200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29149,5 +29208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29157,5 +29216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29166,5 +29225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29173,5 +29232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29181,5 +29240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29189,5 +29248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29197,5 +29256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29205,5 +29264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29213,5 +29272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29221,5 +29280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29229,5 +29288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29237,5 +29296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29245,5 +29304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29266,5 +29325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29279,7 +29338,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29289,5 +29348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29296,5 +29355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29304,5 +29363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29311,5 +29370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29319,5 +29378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29327,5 +29386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29341,5 +29400,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29350,5 +29409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29367,5 +29426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29375,5 +29434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29386,5 +29445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29403,5 +29462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29410,5 +29469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29417,5 +29476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29424,7 +29483,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29435,5 +29494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29448,5 +29507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29460,5 +29519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29468,5 +29527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29480,5 +29539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29492,5 +29551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29499,5 +29558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29506,7 +29565,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29516,5 +29575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29524,5 +29583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29532,5 +29591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29540,5 +29599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29548,5 +29607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29562,7 +29621,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29577,5 +29636,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29590,5 +29649,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29603,5 +29662,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29616,5 +29675,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29629,5 +29688,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29642,7 +29701,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29652,5 +29711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29659,5 +29718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29667,5 +29726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29675,5 +29734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29683,5 +29742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29691,5 +29750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29699,5 +29758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29707,5 +29766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29715,5 +29774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29723,5 +29782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29731,5 +29790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29739,5 +29798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29747,5 +29806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29765,5 +29824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29778,5 +29837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29789,7 +29848,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29799,5 +29858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29807,5 +29866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29815,5 +29874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29823,5 +29882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29831,5 +29890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29839,5 +29898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29847,5 +29906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29855,5 +29914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29863,5 +29922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29871,5 +29930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29879,5 +29938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29887,5 +29946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29895,5 +29954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29903,5 +29962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -29911,5 +29970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -29919,5 +29978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -29939,5 +29998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -29951,7 +30010,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -29961,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -29969,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -29977,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -29985,5 +30044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -29993,5 +30052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30001,5 +30060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30009,5 +30068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30017,5 +30076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30025,5 +30084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30033,5 +30092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30050,5 +30109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30058,5 +30117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30066,5 +30125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30074,5 +30133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30082,5 +30141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30090,5 +30149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30098,5 +30157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30106,5 +30165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30114,5 +30173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30122,5 +30181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30130,5 +30189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30138,5 +30197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30155,5 +30214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30162,5 +30221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30170,5 +30229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30177,5 +30236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30185,5 +30244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30193,5 +30252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30201,5 +30260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30208,5 +30267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30216,5 +30275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30224,5 +30283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30232,5 +30291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30240,5 +30299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30247,5 +30306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30254,5 +30313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30261,5 +30320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30268,5 +30327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30275,5 +30334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30282,5 +30341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30289,5 +30348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30296,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30303,5 +30362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30310,5 +30369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30317,5 +30376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30324,5 +30383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30331,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30339,5 +30398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30347,5 +30406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30355,5 +30414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30363,5 +30422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30371,5 +30430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30379,5 +30438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30387,5 +30446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30395,5 +30454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30403,5 +30462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30412,5 +30471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30420,5 +30479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30428,5 +30487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30436,5 +30495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30444,5 +30503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30452,5 +30511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30460,5 +30519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30468,5 +30527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30476,5 +30535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30484,5 +30543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30492,5 +30551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30500,5 +30559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30508,5 +30567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30516,5 +30575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30524,5 +30583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30532,5 +30591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30540,5 +30599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30548,5 +30607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30556,5 +30615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30564,5 +30623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30571,5 +30630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30601,5 +30660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30609,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30617,7 +30676,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30632,5 +30691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30640,5 +30699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30648,5 +30707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30656,5 +30715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30664,5 +30723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30672,5 +30731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30680,5 +30739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30694,7 +30753,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30704,5 +30763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30712,5 +30771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30720,5 +30779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30728,5 +30787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30736,5 +30795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30744,5 +30803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30752,5 +30811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30760,5 +30819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30768,5 +30827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30776,5 +30835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30784,5 +30843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30792,5 +30851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30800,5 +30859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30808,5 +30867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30816,5 +30875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30824,5 +30883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30832,5 +30891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30840,5 +30899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30848,5 +30907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30856,5 +30915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30864,5 +30923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30872,5 +30931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30880,5 +30939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30888,5 +30947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30896,5 +30955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30904,5 +30963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -30912,5 +30971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -30920,5 +30979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -30928,5 +30987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -30936,5 +30995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -30944,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -30952,5 +31011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -30960,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -30968,5 +31027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -30976,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -30984,5 +31043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -30992,5 +31051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31000,5 +31059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31008,5 +31067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31016,5 +31075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31024,5 +31083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31032,5 +31091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31066,7 +31125,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31076,5 +31135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31084,5 +31143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31092,5 +31151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31100,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31108,5 +31167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31116,5 +31175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31124,5 +31183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31139,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31147,5 +31206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31155,5 +31214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31163,5 +31222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31171,5 +31230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31179,5 +31238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31188,5 +31247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31196,5 +31255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31204,5 +31263,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31212,5 +31271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31219,5 +31278,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31226,5 +31285,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31242,7 +31301,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31252,5 +31311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31260,5 +31319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31268,5 +31327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31276,5 +31335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31284,5 +31343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31292,5 +31351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31300,5 +31359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31308,5 +31367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31316,5 +31375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31332,5 +31391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31344,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31356,5 +31415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31364,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31376,5 +31435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31388,6 +31447,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31397,5 +31456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31409,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31421,5 +31480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31433,5 +31492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31445,5 +31504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31457,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31465,7 +31524,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31475,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31483,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31491,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31499,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31514,5 +31573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31525,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31537,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31549,5 +31608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31561,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31570,5 +31629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31578,5 +31637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31586,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31594,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31602,5 +31661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31617,5 +31676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31629,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31641,5 +31700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31653,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31665,5 +31724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31678,5 +31737,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?
@@ -31702,5 +31761,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31711,11 +31770,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31725,5 +31784,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31733,5 +31792,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31741,5 +31800,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31749,5 +31808,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31757,5 +31816,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31765,5 +31824,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31773,5 +31832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31781,5 +31840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31789,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31797,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31805,5 +31864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31813,5 +31872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31831,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -31924,5 +31983,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -31930,28 +31989,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
@@ -32066,5 +32125,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32077,5 +32136,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>
@@ -32100,6 +32159,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32108,6 +32167,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32122,6 +32181,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
@@ -32135,6 +32194,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
@@ -32154,6 +32213,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32177,6 +32236,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
@@ -32213,4 +32272,5 @@
 #~ msgstr "טען בחירה"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "צור קשר עם {0}..."
@@ -32228,4 +32288,5 @@
 #~ msgstr "ארעו התנגשויות במהלך הייבוא."
 
+#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
@@ -32234,13 +32295,17 @@
 #~ 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}"
@@ -32249,4 +32314,5 @@
 #~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} מתוך הרצועה."
@@ -32255,7 +32321,9 @@
 #~ 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}\"."
@@ -32269,4 +32337,5 @@
 #~ msgstr "שינויים לא שמורים"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
@@ -32281,4 +32350,5 @@
 #~ msgstr "הגירסה הפתורה:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32293,8 +32363,7 @@
 
 #~ 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"
@@ -32313,10 +32382,11 @@
 #~ 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 ""
 #~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
@@ -32329,13 +32399,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}"
@@ -32350,6 +32420,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 וכל התוספים לפני דיווח על תקלה."
 
@@ -32390,7 +32460,9 @@
 #~ msgstr "מעלה..."
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "תוסף לא נמצא: {0}"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "תוסף דורש את עדכון JOSM: {0}."
@@ -32414,4 +32486,5 @@
 #~ msgstr "שגיאה בניתוח תשובת השרת."
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "מחברים: {0}"
@@ -32420,4 +32493,5 @@
 #~ msgstr "שם"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "תמונות עבור {0}"
@@ -32471,4 +32545,5 @@
 #~ msgstr "קבע את השפה."
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32553,4 +32628,5 @@
 #~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32566,4 +32642,5 @@
 #~ msgstr "תוויות (ערך ריק מוחק את התווית)"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "מצבור פקודות: {0}"
@@ -32615,13 +32692,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} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית."
 
@@ -32630,10 +32707,12 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות "
-#~ "התצורה 'pluginmanager.warntime')."
-
+#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות התצורה "
+#~ "'pluginmanager.warntime')."
+
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "לא יכול להוריד תוסף: {0} מ{1}"
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
@@ -32643,17 +32722,20 @@
 
 #~ 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>האם אתה באמת רוצה למחוק?"
+
+#, java-format
 #~ 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}\""
@@ -32674,4 +32756,5 @@
 #~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n"
@@ -32683,4 +32766,5 @@
 #~ msgstr "מזג בכל זאת"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -32697,9 +32781,8 @@
 #~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה."
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
 #~ msgstr[0] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?"
 #~ msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?"
@@ -32726,4 +32809,7 @@
 #~ msgstr "חנות"
 
+#~ msgid "Errors during Download"
+#~ msgstr "שגיאות במהלך הורדה"
+
 #~ msgid "sports"
 #~ msgstr "ספורט"
@@ -32735,4 +32821,5 @@
 #~ msgstr "החלף בחירה עם נתוני משתמש"
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "בודק האם נקודה {0} נעלמה..."
@@ -32765,4 +32852,5 @@
 #~ msgstr "דרכים"
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
@@ -32798,4 +32886,5 @@
 #~ msgstr "הורד"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "עורך יחסים: {0}"
@@ -32804,7 +32893,9 @@
 #~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
 
+#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "ערך מוחזר לא צפוי. התקבל {0}"
@@ -32816,10 +32907,13 @@
 #~ 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 21602)
+++ /applications/editors/josm/i18n/po/is.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-01-31 17:21+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-02 08:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -233,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -256,6 +256,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -311,6 +311,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 ""
 
@@ -334,9 +334,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
@@ -427,6 +427,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -640,12 +640,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1430,5 +1430,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1449,5 +1450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1587,5 +1588,6 @@
 "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
@@ -1595,5 +1597,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Sýna stöðuskýrslu með nytsamlegum upplýsingum sem hægt er að hengja við "
@@ -1617,5 +1620,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1823,5 +1826,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
@@ -1887,9 +1891,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)"
@@ -1906,5 +1910,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2194,6 +2198,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr ""
 
@@ -2228,6 +2232,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2358,6 +2362,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 ""
 
@@ -2475,52 +2479,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Leita..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Leita að hlutum."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Sláðu inn leitarstreng"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "skipta út vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "bæta við val"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "fjarlæga úr vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regluleg segð"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
@@ -2528,18 +2532,18 @@
 "gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Gamla Hringbraut\"</b> - „Gamla Hringbraut“ í einhverjum lykli og gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Gam</b> - „Gam“ kemur fyrir í nafninu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - lykilinn „type“ með gildið „route“."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2549,21 +2553,21 @@
 "<b>*=gildi</b>, <b>type=</b>, <b>*=*</b> og <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Gam</b> - „Gam“ kemur ekki fyrir í nafninu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - Lykillinn „foot“ með eitthvað gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Sérleitir:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2572,17 +2576,17 @@
 "fyrir hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - Hlutir sem breytt hefur verið af gefnum notanda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - hlutur með þessa kennitölu (0 fyrir nýja hluti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2590,5 +2594,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2596,11 +2600,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2608,5 +2612,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2614,39 +2622,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Hlutum sem breytt hefur verið"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Valdir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Ókláraðir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Hlutir án eiginda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>segð</i></b> - allir undirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>segð</i></b> - allir yfirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Notaðu <b>|</b> eða <b>OR</b> t.d. „A | B“ til að leita að A eða B"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2654,11 +2662,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Notaðu <b>(</b> og <b>)</b> til að sameina segðir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2666,38 +2674,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Leit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Hefja leit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2705,5 +2713,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2711,5 +2719,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2717,5 +2725,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2730,14 +2738,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2746,36 +2757,36 @@
 "hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2839,5 +2850,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3045,11 +3056,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:459
@@ -3309,6 +3320,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 ""
 
@@ -3391,5 +3402,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3398,5 +3409,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3405,5 +3416,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3440,5 +3451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3491,5 +3502,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3497,5 +3508,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3503,17 +3514,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr ""
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3521,5 +3526,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3528,5 +3533,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3534,5 +3539,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3540,5 +3545,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3546,42 +3551,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3590,5 +3595,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3596,5 +3601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3650,5 +3655,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3658,81 +3664,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Óþekkt hlutverk \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Villa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3906,5 +3912,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3975,5 +3982,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3983,5 +3990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3990,5 +3997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3997,5 +4004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4004,5 +4011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4011,5 +4018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4018,9 +4025,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4331,6 +4338,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4345,4 +4352,5 @@
 msgstr "Breyta"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4535,5 +4543,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4572,6 +4580,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 ""
 
@@ -4602,5 +4610,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"
@@ -4609,5 +4617,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"
@@ -4616,5 +4624,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"
@@ -4828,5 +4836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4851,6 +4860,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4862,5 +4872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr ""
@@ -4905,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 ""
 
@@ -4912,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 ""
 
@@ -4962,6 +4972,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,6 +5188,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5190,6 +5200,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5487,7 +5497,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 ""
 
@@ -5512,5 +5522,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5528,6 +5539,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5551,5 +5561,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5557,5 +5567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5628,9 +5638,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5648,13 +5659,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5663,45 +5674,41 @@
 msgstr "Bæta við"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5928,10 +5935,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6274,4 +6281,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7385,6 +7393,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 ""
 
@@ -7408,8 +7416,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 ""
 
@@ -7529,5 +7537,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7536,23 +7544,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7561,5 +7569,5 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7568,77 +7576,81 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Veldu gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Veldu hluti til að breyta eigindum þeirra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Eigindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Eigindi valdra hluta."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Stak í"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Eigindi & vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7755,6 +7767,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 ""
 
@@ -7772,10 +7784,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
@@ -7929,6 +7941,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8262,6 +8275,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8321,4 +8335,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8401,6 +8416,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 ""
 
@@ -8410,6 +8425,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 ""
 
@@ -8683,8 +8698,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8699,7 +8715,8 @@
 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 ""
 
@@ -8785,5 +8802,6 @@
 #: ../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
@@ -8937,5 +8955,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8952,5 +8970,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9035,6 +9054,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] ""
@@ -9048,6 +9067,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 "
@@ -9273,5 +9292,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9297,5 +9316,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9350,6 +9370,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 ""
 
@@ -9403,7 +9423,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 ""
 
@@ -9413,5 +9433,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9436,5 +9456,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9444,6 +9465,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
@@ -9656,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 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 ""
 
@@ -9682,7 +9703,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 ""
 
@@ -9746,6 +9767,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 
@@ -9759,5 +9780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9921,6 +9942,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 ""
 
@@ -9980,7 +10001,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 ""
 
@@ -10045,64 +10066,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10112,20 +10137,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10134,5 +10159,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10140,21 +10165,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10162,17 +10187,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10181,5 +10206,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10230,14 +10255,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10246,5 +10271,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10253,10 +10278,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10265,5 +10290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10547,6 +10572,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 ""
 
@@ -10568,8 +10593,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 ""
 
@@ -10689,6 +10714,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 ""
 
@@ -10798,5 +10823,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10930,8 +10956,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 ""
 
@@ -11014,8 +11040,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 ""
 
@@ -11042,7 +11068,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 ""
 
@@ -11057,5 +11083,6 @@
 #: ../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
@@ -11113,34 +11140,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11148,5 +11171,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11154,21 +11177,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11176,5 +11193,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11182,5 +11199,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11188,17 +11205,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11206,13 +11223,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11252,5 +11269,5 @@
 msgstr "Litir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11261,34 +11278,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Fyrir staðværar skrár"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Aldrei"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Force lines if no segments imported."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Teikna stóra GPS punkta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hraði (rauður = hægari, grænn = hraðari)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11296,5 +11313,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11316,5 +11333,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11356,5 +11373,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11368,50 +11385,60 @@
 msgstr "Fótgangandi"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+msgid "Draw Direction Arrows"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
-msgid "Draw Direction Arrows"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+msgid "Only on the head of a way."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
-msgid "Only on the head of a way."
+msgid "Draw segment order numbers"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw segment order numbers"
+msgid "Draw boundaries of downloaded data"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw boundaries of downloaded data"
+msgid "Draw virtual nodes in select mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw virtual nodes in select mode"
+msgid "Draw inactive layers in other color"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw inactive layers in other color"
+msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Teikna línu á milli GPS punkta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11421,9 +11448,9 @@
 "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Hámarkslengd lína fyrir staðværar skrár (í metrum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11432,25 +11459,26 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Hámarkslengt milli punkta (í metrum)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11458,13 +11486,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11472,9 +11500,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11482,46 +11510,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM gögn"
@@ -11593,5 +11622,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11640,6 +11670,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11716,6 +11746,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 ""
 
@@ -11728,9 +11758,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 ""
 
@@ -12028,6 +12058,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 ""
 
@@ -12149,6 +12179,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 ""
 
@@ -12170,6 +12200,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 ""
 
@@ -12247,5 +12277,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12261,5 +12292,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12353,6 +12385,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 ""
 
@@ -12648,5 +12680,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
@@ -12827,5 +12859,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13210,6 +13243,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 ""
 
@@ -13237,6 +13270,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 ""
 
@@ -13278,5 +13311,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13707,14 +13741,20 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"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
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13723,23 +13763,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, 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?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13747,5 +13782,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13753,17 +13788,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13771,5 +13806,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13781,42 +13816,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Gera viðbótina óvirka"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Halda viðbótinni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13825,5 +13860,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13832,30 +13867,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
-#, java-format
-msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13863,14 +13898,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13911,5 +13946,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13971,5 +14007,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"
@@ -14052,6 +14088,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 ""
 
@@ -14059,7 +14095,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 ""
 
@@ -14067,7 +14103,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 ""
 
@@ -14075,8 +14111,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 ""
 
@@ -14096,7 +14132,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 ""
 
@@ -14165,6 +14201,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14176,7 +14213,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 ""
 
@@ -14208,9 +14245,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14873,7 +14910,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14883,5 +14920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14891,5 +14928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14905,5 +14942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14913,5 +14950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -14942,5 +14979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -14949,5 +14986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -14956,5 +14993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -14963,5 +15000,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -14970,5 +15007,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -14977,5 +15014,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15009,10 +15046,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15486,34 +15524,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -15586,5 +15625,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15675,4 +15714,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15882,5 +15922,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16001,5 +16041,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16018,6 +16059,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16323,5 +16365,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -16431,5 +16474,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16480,5 +16524,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17294,4 +17339,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17736,6 +17789,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 ""
 
@@ -17821,8 +17874,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 ""
 
@@ -17876,8 +17929,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 ""
 
@@ -17989,6 +18042,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 ""
 
@@ -17996,6 +18049,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 ""
 
@@ -18628,6 +18681,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18774,5 +18828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18872,5 +18926,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19245,9 +19299,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19256,10 +19307,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr ""
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19267,25 +19318,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19293,17 +19344,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "skógur (ræktaður)"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19311,7 +19362,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19321,5 +19372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19362,5 +19413,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19370,5 +19421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19378,5 +19429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19386,8 +19437,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19401,5 +19452,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19410,5 +19461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19417,7 +19468,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19427,5 +19478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19435,5 +19486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19443,5 +19494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19451,5 +19502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19459,5 +19510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19467,5 +19518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19475,8 +19526,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19486,54 +19537,60 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Valfrjáls eigind:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
 msgid "Modified"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Skráarnafn"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Vefsíða."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "List"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Þysja inn"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
 msgid "New Folder"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Búa til nýjan hnút."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Vista"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19604,5 +19661,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19768,6 +19826,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19776,5 +19841,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19783,10 +19848,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19795,5 +19860,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19803,5 +19868,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19810,15 +19875,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19827,5 +19892,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20715,7 +20780,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20855,8 +20920,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"/>
@@ -21066,5 +21131,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21074,5 +21139,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21091,5 +21156,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21099,5 +21164,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21116,5 +21181,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21124,5 +21189,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21141,5 +21206,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21149,5 +21214,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21162,5 +21227,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21178,5 +21243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21194,5 +21259,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21201,5 +21266,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21209,5 +21274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21227,5 +21292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21234,5 +21299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21242,5 +21307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21944,5 +22009,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -21993,5 +22058,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22088,5 +22153,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22254,5 +22319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22586,5 +22651,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22594,5 +22659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22602,5 +22667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22610,5 +22675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22618,5 +22683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22626,5 +22691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22634,5 +22699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22643,5 +22708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24061,5 +24126,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24069,5 +24134,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24077,5 +24142,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24085,5 +24150,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24447,7 +24512,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24457,5 +24522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24465,5 +24530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24473,5 +24538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24481,5 +24546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24489,5 +24554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24497,5 +24562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24505,5 +24570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24513,5 +24578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24521,5 +24586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24529,5 +24594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24537,5 +24602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24545,5 +24610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24553,5 +24618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24561,5 +24626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24569,5 +24634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24577,5 +24642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24585,5 +24650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24593,5 +24658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24601,5 +24666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24609,5 +24674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24617,5 +24682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24625,5 +24690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24633,5 +24698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24641,5 +24706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24649,5 +24714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24657,5 +24722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24665,5 +24730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24673,5 +24738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24681,5 +24746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24689,5 +24754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24697,5 +24762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24705,5 +24770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24713,5 +24778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24721,5 +24786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24729,5 +24794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24737,5 +24802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24745,5 +24810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24753,5 +24818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24761,5 +24826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24769,5 +24834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24777,5 +24842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24785,5 +24850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24793,5 +24858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24801,5 +24866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24809,5 +24874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24817,5 +24882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26521,7 +26586,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26531,5 +26596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26539,5 +26604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26547,5 +26612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26555,5 +26620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26563,5 +26628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26571,5 +26636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26579,5 +26644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26587,5 +26652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28008,5 +28073,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28022,5 +28087,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28030,5 +28095,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28039,5 +28104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28050,7 +28115,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28060,5 +28125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28068,5 +28133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28076,5 +28141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28084,5 +28149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28116,5 +28181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28130,5 +28195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28138,5 +28203,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28145,5 +28210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28153,5 +28218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28162,5 +28227,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28185,5 +28250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28298,9 +28363,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
@@ -28308,5 +28373,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,
@@ -28316,8 +28381,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
@@ -28331,5 +28396,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28337,5 +28402,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28384,6 +28449,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>
@@ -28463,5 +28528,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28471,11 +28536,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28491,5 +28556,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28498,5 +28563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28505,5 +28570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28519,5 +28584,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28531,5 +28596,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28538,5 +28603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28545,5 +28610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28552,5 +28617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28559,5 +28624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28566,5 +28631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28573,5 +28638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28580,5 +28645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28587,5 +28652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28594,5 +28659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28601,5 +28666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28608,5 +28673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28615,5 +28680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28622,5 +28687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28629,5 +28694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28804,7 +28869,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28818,5 +28883,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28826,7 +28891,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28836,5 +28901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28844,5 +28909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28852,5 +28917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28860,5 +28925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28874,5 +28939,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28881,5 +28946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28889,5 +28954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -28896,5 +28961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -28903,5 +28968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -28910,5 +28975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -28917,5 +28982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -28924,5 +28989,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -28931,5 +28996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -28938,5 +29003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -28945,5 +29010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -28952,5 +29017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -28964,5 +29029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -28976,5 +29041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -28983,5 +29048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -28995,5 +29060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29008,5 +29073,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29021,5 +29086,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29033,5 +29098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29045,5 +29110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29052,5 +29117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29059,5 +29124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29067,5 +29132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29074,5 +29139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29081,5 +29146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29088,5 +29153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29096,5 +29161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29105,5 +29170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29113,7 +29178,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29123,5 +29188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29131,5 +29196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29139,5 +29204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29148,5 +29213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29155,5 +29220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29163,5 +29228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29171,5 +29236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29179,5 +29244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29187,5 +29252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29195,5 +29260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29203,5 +29268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29211,5 +29276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29219,5 +29284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29227,5 +29292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29248,5 +29313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29261,7 +29326,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29271,5 +29336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29278,5 +29343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29286,5 +29351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29293,5 +29358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29301,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29309,5 +29374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29323,5 +29388,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29332,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29349,5 +29414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29357,5 +29422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29368,5 +29433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29385,5 +29450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29392,5 +29457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29399,5 +29464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29406,7 +29471,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29417,5 +29482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29430,5 +29495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29442,5 +29507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29450,5 +29515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29462,5 +29527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29474,5 +29539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29481,5 +29546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29488,7 +29553,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29498,5 +29563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29506,5 +29571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29514,5 +29579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29522,5 +29587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29530,5 +29595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29544,7 +29609,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29559,5 +29624,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29572,5 +29637,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29585,5 +29650,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29598,5 +29663,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29611,5 +29676,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29624,7 +29689,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29634,5 +29699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29641,5 +29706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29649,5 +29714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29657,5 +29722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29665,5 +29730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29673,5 +29738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29681,5 +29746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29689,5 +29754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29697,5 +29762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29705,5 +29770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29713,5 +29778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29721,5 +29786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29729,5 +29794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29747,5 +29812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29760,5 +29825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29771,7 +29836,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29781,5 +29846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29789,5 +29854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29797,5 +29862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29805,5 +29870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29813,5 +29878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29821,5 +29886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29829,5 +29894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29837,5 +29902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29845,5 +29910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29853,5 +29918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29861,5 +29926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29869,5 +29934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29877,5 +29942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29885,5 +29950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -29893,5 +29958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -29901,5 +29966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -29921,5 +29986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -29933,7 +29998,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -29943,5 +30008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -29951,5 +30016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -29959,5 +30024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -29967,5 +30032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -29975,5 +30040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -29983,5 +30048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -29991,5 +30056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -29999,5 +30064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30007,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30015,5 +30080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30032,5 +30097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30040,5 +30105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30048,5 +30113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30056,5 +30121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30064,5 +30129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30072,5 +30137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30080,5 +30145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30088,5 +30153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30096,5 +30161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30104,5 +30169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30112,5 +30177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30120,5 +30185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30137,5 +30202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30144,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30152,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30159,5 +30224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30167,5 +30232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30175,5 +30240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30183,5 +30248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30190,5 +30255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30198,5 +30263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30206,5 +30271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30214,5 +30279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30222,5 +30287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30229,5 +30294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30236,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30243,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30250,5 +30315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30257,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30264,5 +30329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30271,5 +30336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30278,5 +30343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30285,5 +30350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30292,5 +30357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30299,5 +30364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30306,5 +30371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30313,5 +30378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30321,5 +30386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30329,5 +30394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30337,5 +30402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30345,5 +30410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30353,5 +30418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30361,5 +30426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30369,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30377,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30385,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30394,5 +30459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30402,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30410,5 +30475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30418,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30426,5 +30491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30434,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30442,5 +30507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30450,5 +30515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30458,5 +30523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30466,5 +30531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30474,5 +30539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30482,5 +30547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30490,5 +30555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30498,5 +30563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30506,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30514,5 +30579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30522,5 +30587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30530,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30538,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30546,5 +30611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30553,5 +30618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30583,5 +30648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30591,5 +30656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30599,7 +30664,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30614,5 +30679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30622,5 +30687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30630,5 +30695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30638,5 +30703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30646,5 +30711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30654,5 +30719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30662,5 +30727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30676,7 +30741,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30686,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30694,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30702,5 +30767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30710,5 +30775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30718,5 +30783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30726,5 +30791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30734,5 +30799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30742,5 +30807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30750,5 +30815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30758,5 +30823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30766,5 +30831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30774,5 +30839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30782,5 +30847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30790,5 +30855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30798,5 +30863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30806,5 +30871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30814,5 +30879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30822,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30830,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30838,5 +30903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30846,5 +30911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30854,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30862,5 +30927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30870,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30878,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30886,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -30894,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -30902,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -30910,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -30918,5 +30983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -30926,5 +30991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -30934,5 +30999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -30942,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -30950,5 +31015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -30958,5 +31023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -30966,5 +31031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -30974,5 +31039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -30982,5 +31047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -30990,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -30998,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31006,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31014,5 +31079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31048,7 +31113,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31058,5 +31123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31066,5 +31131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31074,5 +31139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31082,5 +31147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31090,5 +31155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31098,5 +31163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31106,5 +31171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31121,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31129,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31137,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31145,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31153,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31161,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31170,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31178,5 +31243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31186,5 +31251,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31194,5 +31259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31201,5 +31266,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31208,5 +31273,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31224,7 +31289,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31234,5 +31299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31242,5 +31307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31250,5 +31315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31258,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31266,5 +31331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31274,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31282,5 +31347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31290,5 +31355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31298,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31314,5 +31379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31326,5 +31391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31338,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31346,5 +31411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31358,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31370,6 +31435,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31379,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31391,5 +31456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31403,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31415,5 +31480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31427,5 +31492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31439,5 +31504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31447,7 +31512,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31457,5 +31522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31465,5 +31530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31473,5 +31538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31481,5 +31546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31496,5 +31561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31507,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31519,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31531,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31543,5 +31608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31552,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31560,5 +31625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31568,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31576,5 +31641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31584,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31599,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31611,5 +31676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31623,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31635,5 +31700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31647,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31660,5 +31725,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?
@@ -31684,5 +31749,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31693,11 +31758,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31707,5 +31772,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31715,5 +31780,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31723,5 +31788,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31731,5 +31796,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31739,5 +31804,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31747,5 +31812,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31755,5 +31820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31763,5 +31828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31771,5 +31836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31779,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31787,5 +31852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31795,5 +31860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31813,5 +31878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -31906,5 +31971,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -31912,28 +31977,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
@@ -32048,5 +32113,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32059,5 +32124,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>
@@ -32082,6 +32147,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32090,6 +32155,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32104,6 +32169,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
@@ -32117,6 +32182,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
@@ -32136,6 +32201,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32159,6 +32224,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
@@ -32177,4 +32242,5 @@
 #~ msgstr "Sláðu inn lykilorð"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Viðbótin „{0}“ fannst ekki."
@@ -32183,4 +32249,5 @@
 #~ 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ð."
@@ -32213,4 +32280,5 @@
 #~ msgstr "Lykilorð á milliþjóni"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32230,4 +32298,5 @@
 #~ msgstr "Óþekkt skráarending"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32239,4 +32308,5 @@
 #~ "{0}"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
@@ -32265,6 +32335,5 @@
 
 #~ 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:"
@@ -32286,4 +32355,5 @@
 #~ msgstr "ónefnt"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32291,4 +32361,5 @@
 #~ msgstr[1] "{0} hlutir hafa árekstra:"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Skipanasaga: {0}"
@@ -32301,6 +32372,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 "
@@ -32313,4 +32384,5 @@
 #~ msgstr "Upphala til OSM..."
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Vinsamlegast sendu meldinguna á {0}"
@@ -32322,6 +32394,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 þú "
@@ -32341,18 +32413,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"
@@ -32395,7 +32467,9 @@
 #~ 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}“"
@@ -32448,6 +32522,5 @@
 #~ "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."
@@ -32466,4 +32539,5 @@
 #~ msgstr "Færa niður"
 
+#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Stök: {0} (tengd: {1})"
@@ -32473,9 +32547,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."
@@ -32483,6 +32557,5 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst."
 
@@ -32494,19 +32567,22 @@
 
 #~ 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 "
@@ -32516,4 +32592,5 @@
 #~ "breytingunni hefur verið upphlaðið"
 
+#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
@@ -32526,9 +32603,8 @@
 #~ msgstr "Endurhlaða vallistann"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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?"
@@ -32536,4 +32612,5 @@
 #~ "Þú 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 "
@@ -32542,10 +32619,11 @@
 #~ "<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 21602)
+++ /applications/editors/josm/i18n/po/it.po	(revision 21603)
@@ -5,5 +5,5 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-05-22 23:22+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-02 08:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -64,5 +64,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -262,6 +262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -316,6 +316,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>"
@@ -340,9 +340,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
@@ -433,6 +433,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -649,12 +649,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1305,6 +1305,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
@@ -1480,5 +1480,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1499,5 +1500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1649,5 +1650,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Visualizza il rapporto dello stato contenente informazioni utili che possono "
@@ -1671,5 +1673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1880,5 +1882,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
@@ -1954,9 +1957,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)"
@@ -1973,5 +1976,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2276,7 +2279,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Errori durante lo scaricamento"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Errore durante lo scaricamento"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2310,7 +2313,7 @@
 msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la relazione {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Errore durante lo scaricamento"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2449,6 +2452,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 "
@@ -2543,7 +2546,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
@@ -2583,66 +2586,66 @@
 msgstr "<fin-del-file>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Cerca..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Cerca degli oggetti."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Inserire una stringa di filtro."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Inserire una stringa di ricerca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Inserire l''espressione di ricerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "Sostituisci la selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "Aggiungi alla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "Rimuovi dalla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "cerca nella selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "Distingui maiuscole"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "espressione regolare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Via Nazionale</b> - ''Via'' e ''Nazionale'' in qualunque chiave o nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Via Nazionale\"</b> - ''Via Nazionale'' in qualunque chiave o nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Naz</b> - ''Naz'' in qualunque punto del nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr ""
@@ -2650,5 +2653,5 @@
 "''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2658,21 +2661,21 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Naz</b> - ''Naz'' non presente all''interno del nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>senso unico?</b> - oneway=yes, true, 1 oppure on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - chiave=foot impostata con qualunque valore."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Ricerche speciali:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2680,17 +2683,18 @@
 "<b>type:</b> - tipo dell''oggetto (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - tutti gli oggetti modificati dall''utente"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - tutti gli oggetti modificati da utenti anonimi"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+msgstr ""
+"<b>user:anonymous</b> - tutti gli oggetti modificati da utenti anonimi"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - oggetto con un dato ID (0 per nuovi oggetti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2700,5 +2704,5 @@
 "non è stata assegnata una versione)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2708,13 +2712,13 @@
 "di modifiche (0 oggetti a cui non è stato assegnato un gruppo di modifiche)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
 msgstr ""
 "<b>nodes:</b>... - oggetto con un determinato numero di nodi (nodes:numero "
 "oppure nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2724,5 +2728,9 @@
 "etichette:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2732,21 +2740,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> oppure <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tutti gli oggetti modificati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tutti gli oggetti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tutti gli oggetti incompleti"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tutti gli oggetti provi di proprietà"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2755,5 +2763,5 @@
 "all''espressione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2762,5 +2770,5 @@
 "oggetti corrispondenti all''espressione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2768,5 +2776,5 @@
 "logico ''or''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2774,5 +2782,5 @@
 "<b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2780,14 +2788,14 @@
 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>)."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+"<b>\\</b> devono essere preceduti  da <b>\\</b> (es. <b>\\\"</b> e <b>\\\\"
+"</b>)."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilizzare <b>(</b> e <b>)</b> per raggruppare le espressioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2795,33 +2803,33 @@
 msgstr "Filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Cerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Invia filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Inizia Ricerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nessuna corrispondenza trovata per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
@@ -2829,5 +2837,5 @@
 "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2835,5 +2843,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2841,5 +2849,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2847,5 +2855,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2864,5 +2872,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2870,10 +2886,5 @@
 "etichetta. Esempio di utilizzo: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, 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!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2882,36 +2893,36 @@
 "relazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Token inaspettato. Era atteso {0}, trovato {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Token inaspettato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Parametro mancante per OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Operatore mancante per NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Era atteso un identificativo di primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Atteso intervallo di numeri"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Era atteso un identificativo del gruppo di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Era attesa una versione"
@@ -2984,5 +2995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3198,7 +3209,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 "
@@ -3481,6 +3492,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 "
@@ -3579,5 +3590,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3586,5 +3597,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3593,5 +3604,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3630,5 +3641,5 @@
 "incluso"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3638,7 +3649,7 @@
 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
@@ -3689,5 +3700,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3695,5 +3706,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3701,17 +3712,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Testo"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3719,5 +3724,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3726,5 +3731,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3732,5 +3737,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3738,5 +3743,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3744,43 +3749,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro attivo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> oggetti nascosti"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> oggetti disabilitati"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Chiudi la finestra di filtro per vedere tutti gli oggetti.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Era atteso un ID > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "attesa versione > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3791,5 +3796,5 @@
 "nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3798,5 +3803,5 @@
 "Impossibile unire perché una delle primitive coinvolte è nuova e l''altra no"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3856,5 +3861,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "Impossibile confrontare la primitiva con ID ''{0}'' alla primitiva con ID "
@@ -3866,81 +3872,81 @@
 msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Il percorso dello stile dell''area non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "E'' stato trovato più di un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "E'' stato trovato più di un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "E'' stata trovata più di una \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ruolo ''{0}'' sconosciuto."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo di membro sconosciuto per ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Non è stato trovato un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Non è stato trovato un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Non è stato trovato alcun nodo o percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non è stato trovato lo stile per la restrizione {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Lo stile per il percorso esterno ''{0}'' è discordante."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Errore: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4016,6 +4022,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
@@ -4116,8 +4122,9 @@
 #: ../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
@@ -4187,5 +4194,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4195,5 +4202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4202,5 +4209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4209,5 +4216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4216,5 +4223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4223,5 +4230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4230,9 +4237,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4450,5 +4457,6 @@
 #: ../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
@@ -4565,6 +4573,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4579,4 +4587,5 @@
 msgstr "Modifica"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4679,7 +4688,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:298
@@ -4779,5 +4788,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4820,11 +4829,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
@@ -4856,5 +4865,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"
@@ -4863,5 +4872,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"
@@ -4870,5 +4879,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"
@@ -5104,5 +5113,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copia i loro elementi selezionati alla fine della lista degli elementi uniti"
@@ -5132,6 +5142,7 @@
 msgstr "Copia tutti i loro elementi verso la destinazione"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5143,5 +5154,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Giù"
@@ -5186,6 +5197,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 "
@@ -5195,6 +5206,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 "
@@ -5251,6 +5262,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 "
@@ -5326,5 +5337,6 @@
 #: ../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
@@ -5439,6 +5451,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
@@ -5492,6 +5504,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5504,6 +5516,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5631,5 +5643,6 @@
 #, 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
@@ -5751,6 +5764,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5777,8 +5790,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
@@ -5793,9 +5806,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
@@ -5830,7 +5843,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 "
@@ -5861,5 +5874,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 "Scarica dal server OSM le informazioni riguardanti i gruppi di modifiche "
@@ -5879,6 +5893,5 @@
 msgstr "Apri una pagina web per ogni gruppo di modifiche selezionato"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5905,5 +5918,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5911,5 +5924,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5959,5 +5972,6 @@
 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
@@ -5984,9 +5998,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 "<html> Non è stata completata la fusione delle differenze in questo "
@@ -6010,13 +6025,13 @@
 msgstr "Risolvi i conflitti per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtra oggetti e nascondili/disabilitali."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -6025,45 +6040,41 @@
 msgstr "Aggiungi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Aggiungi filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Modifica filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Elimina filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Sposta filtro in alto."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Sposta filtro in basso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Abilita filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Nascondi elementi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Applica anche ai figli"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Filtro inverso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Modalità filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6231,5 +6242,6 @@
 #: ../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
@@ -6296,10 +6308,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
@@ -6662,4 +6674,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7806,9 +7819,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
@@ -7836,8 +7849,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 "
@@ -7857,6 +7870,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
@@ -7869,7 +7882,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
@@ -7932,9 +7945,11 @@
 #: ../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
@@ -7979,5 +7994,5 @@
 "L'indirizzo URL per l'interrogazione sui gruppi di modifiche non è valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7986,23 +8001,23 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Un campo vuoto cancellerà il tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8011,5 +8026,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -8018,77 +8033,81 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Selezionare la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
@@ -8209,6 +8228,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 "
@@ -8230,6 +8249,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 "
@@ -8410,6 +8429,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 "<html>Il livello ''''{0}'''' contiene già un conflitto per la "
@@ -8700,5 +8720,6 @@
 #: ../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
@@ -8741,7 +8762,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
@@ -8774,10 +8795,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>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
@@ -8836,4 +8858,5 @@
 msgstr "Interrogazione del server dei nomi ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8917,6 +8940,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 "
@@ -8926,6 +8949,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
@@ -8934,6 +8957,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 "
@@ -8948,7 +8971,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
@@ -9143,6 +9166,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
@@ -9238,18 +9261,19 @@
 "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
@@ -9263,13 +9287,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9393,5 +9418,6 @@
 #: ../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
@@ -9537,5 +9563,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Lancia una finestra di selezione file"
@@ -9552,5 +9578,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "Il livello ''''{0}'''' contiene delle modifiche che dovrebbero essere "
@@ -9599,5 +9626,6 @@
 #, 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
@@ -9644,6 +9672,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 "
@@ -9663,6 +9691,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 "
@@ -9845,5 +9873,6 @@
 #: ../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
@@ -9907,5 +9936,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9924,6 +9953,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
@@ -9933,9 +9962,10 @@
 "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"
@@ -10000,13 +10030,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 "
@@ -10052,7 +10082,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
@@ -10067,7 +10097,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 "
@@ -10081,5 +10111,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -10108,5 +10138,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "L''eccezione che è stata generata verrà ignorata perché il caricamento è "
@@ -10169,6 +10200,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
@@ -10348,11 +10379,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
@@ -10377,11 +10408,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:373
@@ -10444,6 +10475,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Il caricamento di dati GPS non elaborati assunti come dati "
@@ -10460,5 +10491,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10641,6 +10672,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 "
@@ -10703,11 +10734,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
@@ -10775,64 +10806,68 @@
 msgstr "Auto-determina"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Regolazione manuale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Sovrapposizione per: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Immagini con georeferenziazione nei dati exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Immagini che sono state già etichettate ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Visualizza le miniature delle immagini sulla mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Fuso orario: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Scostamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Correla le immagini al tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Fuso orario non valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Compensazione non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Riprova"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Non è stato possibile correlare alcuna immagine!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Nessun tracciato gpx selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10844,20 +10879,20 @@
 "<html>Correlate <b>{0}</b> di <b>{1}</b> foto al tracciato GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuso orario: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10866,5 +10901,5 @@
 msgstr[1] "Differenza temporale di {0} giorni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10875,21 +10910,21 @@
 "manualmente le foto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "E'' fallita la correlazione delle foto al tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Regola fuso orario e differenza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Le foto selezionate non contengono informazioni sull''ora."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Le foto non contengono informazioni sull''ora"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10899,17 +10934,17 @@
 "Selezionarne un altro."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "Il tracciato GPX non contiene alcuna informazione sull''ora"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Selezionare un tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Nessun tracciato GPX selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10920,5 +10955,5 @@
 "Formato atteso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10971,14 +11006,14 @@
 msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Immagini georeferenziate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Correlazione ai dati GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10987,5 +11022,5 @@
 msgstr[1] "{0} immagini caricate."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10994,10 +11029,10 @@
 msgstr[1] "Trovate {0} contenti informazioni GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Elimina il file immagine dal disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -11008,5 +11043,5 @@
 "definitivamente perduto!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Il file dell''immagine non può essere eliminato."
@@ -11243,7 +11278,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
@@ -11311,6 +11346,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 "
@@ -11342,8 +11377,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 "
@@ -11369,8 +11404,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
@@ -11490,10 +11525,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>"
 
@@ -11571,6 +11606,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
@@ -11595,5 +11630,6 @@
 #: ../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
@@ -11616,5 +11652,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 "Fallita l''autenticazione dell''utente ''''{0}'''' con la password "
@@ -11710,6 +11747,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
@@ -11726,6 +11763,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
@@ -11766,8 +11803,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à "
@@ -11871,14 +11908,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
@@ -11911,7 +11948,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,14 +12024,10 @@
 msgstr "Mostra la traccia audio attiva."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Crea marcatori non-audio quando leggi un file GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Punti del percorso espliciti con data/ora valida."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
@@ -12002,13 +12035,13 @@
 "tracciato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Punti del tracciato con nome."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Orari di modifica (marcatori temporali) dei file audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -12016,9 +12049,9 @@
 "altri marcatori disponibili)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Mostra o nascondi il menù audio nella barra del menù principale."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -12029,5 +12062,5 @@
 "registrata."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -12037,18 +12070,10 @@
 "marcatore audio come icona del tasto."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Quando si apre un layer GPX crea automaticamente un marcatore sul livello "
-"per ogni punto del percorso."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Quando importi l''audio, crea marcatori da ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
@@ -12056,6 +12081,6 @@
 "GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -12065,5 +12090,5 @@
 "dai punti del percorso espliciti) con i nomi o le descrizioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -12073,5 +12098,5 @@
 "all''orario di modifica di ogni file audio WAV importato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -12081,17 +12106,17 @@
 "bottone è schiacciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Avanti/indietro del tempo (in secondi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Valore dell''aumento della velocità per l''avanzamento veloce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Moltiplicatore dell''avanzamento veloce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -12101,9 +12126,9 @@
 "traccia audio dalla posizione richiesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Tempo di rappresentazione (secondi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
@@ -12111,5 +12136,5 @@
 "trascorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Calibrazione del registratore vocale"
@@ -12149,5 +12174,5 @@
 msgstr "Colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12158,35 +12183,35 @@
 msgstr "Tutti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "File locali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Nessuno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Forza le linee se nessun segmento è stato importato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Disegna dei punti GPS grandi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Disegna un cerchio in base al valore HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocità (rosso = lento, verde = veloce)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -12194,5 +12219,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12214,5 +12239,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12254,5 +12279,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12266,51 +12291,63 @@
 msgstr "Pedone"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Disegna le linee di direzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Disegno veloce (appare più brutto)"
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Solo suggerimenti di direzioni interessanti (es. con etichetta oneway)."
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-"Solo suggerimenti di direzioni interessanti (es. con etichetta oneway)."
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Solo sull'estremità di un percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Disegna i numeri d''ordine dei segmenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Disegna i confini dei dati scaricati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Disegna dei nodi virtuali nella modalità selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Disegna con altri colori i layer non attivi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Grafica della mappa migliorata (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Quando si apre un layer GPX crea automaticamente un marcatore sul livello "
+"per ogni punto del percorso."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Disegna le linee tra i punti GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12320,9 +12357,9 @@
 "Usare ''-1'' per disegnare qualsiasi linea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Massima lunghezza per files locali (metri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12331,10 +12368,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12343,5 +12380,5 @@
 "sulle linee."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -12349,6 +12386,7 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Disegna le frecce di direzione usando riferimenti tabellari piuttosto che "
@@ -12356,5 +12394,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12362,13 +12400,13 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Distanza minima (in pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12378,9 +12416,9 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12391,5 +12429,5 @@
 "registrare queste informazioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12397,18 +12435,18 @@
 "velocità medie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Punti GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Disegna il verso sui segmenti dei percorsi."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
@@ -12417,16 +12455,17 @@
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Applicando l''antialiasing alla mappa, la visualizzazione risulterà migliore."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Disegna i confini dei dati scaricati dal server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12435,9 +12474,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Disegna con un colore diverso i layer non attivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Dati OSM"
@@ -12510,5 +12549,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12516,6 +12556,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
@@ -12562,6 +12602,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Aggiorna estensioni"
@@ -12643,6 +12683,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 "
@@ -12660,9 +12700,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 "
@@ -12986,6 +13026,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 "
@@ -13120,6 +13160,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 "
@@ -13147,6 +13187,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 "
@@ -13164,6 +13204,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
@@ -13222,6 +13262,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
@@ -13246,5 +13286,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 "Attenzione: Fallito l'ottenimento del token di accesso OAuth dal gestore "
@@ -13266,5 +13307,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr "Si possiede già un token di accesso al server OSM mediante OAuth."
 
@@ -13299,6 +13341,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
@@ -13368,6 +13410,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 "
@@ -13659,5 +13701,6 @@
 #, 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
@@ -13695,5 +13738,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
@@ -13876,5 +13919,6 @@
 #, 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
@@ -13889,5 +13933,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "Nessuna primitiva con id {0} nell''insieme di dati locale. Impossibile "
@@ -14016,5 +14061,6 @@
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''."
+msgstr ""
+"Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
@@ -14084,5 +14130,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
 msgid "Current changeset is null. Cannot upload data."
-msgstr "Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati."
+msgstr ""
+"Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
@@ -14245,10 +14292,12 @@
 #, 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
@@ -14312,12 +14361,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 "
@@ -14327,5 +14376,6 @@
 #, 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
@@ -14347,6 +14397,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 "
@@ -14364,5 +14414,6 @@
 #, 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
@@ -14396,5 +14447,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "Valore non valido per l''attributo ''''ref'''' sul membro nella relazione "
@@ -14719,5 +14771,6 @@
 #: ../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
@@ -14776,5 +14829,6 @@
 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:"
@@ -14788,6 +14842,7 @@
 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
@@ -14879,6 +14934,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 "
@@ -14886,10 +14941,16 @@
 "estensione.</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "caricamento estensione ''{0}'' (versione {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14900,23 +14961,18 @@
 "''{1}'' non è stata trovata.<br>Eliminare dalle preferenze?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Caricamento estensioni ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Controllo requisiti estensione..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Caricamento estensione ''''{0}''''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14926,5 +14982,5 @@
 "JOSM non riesce a trovare le informazioni riguardanti le seguenti estensioni:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14932,17 +14988,17 @@
 msgstr[1] "Le estensioni non saranno caricate."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Determinazione delle estensioni da caricare..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Rimozione delle estensioni deprecate..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Rimozione delle estensioni non più mantenute..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14950,5 +15006,5 @@
 msgstr[1] "E' fallito l'aggiornamento delle seguenti estensioni:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14964,10 +15020,10 @@
 "avviato e provare ad aggiornarle manualmente."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Aggiornamento dell'estensione fallito"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
@@ -14975,27 +15031,27 @@
 "dell''estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Disabilita estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Cliccare per eliminare l''estensione ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Mantieni estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Cliccare per mantenere l''estensione ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
@@ -15003,6 +15059,6 @@
 "Attenzione: fallita l''eliminazione dell''estensione obsoleta ''''{0}''''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -15014,5 +15070,5 @@
 "dell''estensione."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -15023,10 +15079,10 @@
 "temporaneo ''''{1}''''. E'' fallito il cambio del nome."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Cliccare per disabilitare l''estensione ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -15036,10 +15092,10 @@
 "dall''estensione ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Secondo le informazioni all''interno del plugin l''autore è {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -15048,9 +15104,9 @@
 "comunicare un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Disabilitare l''estensione?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -15060,14 +15116,14 @@
 "eliminare l''estensione."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Informazioni sull''estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "nessuna descrizione disponibile"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -15112,5 +15168,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Attenzione: Fallita la ricerca delle informazioni sull''estensione nel file "
@@ -15179,5 +15236,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"
@@ -15252,7 +15309,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
@@ -15276,7 +15333,8 @@
 "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
@@ -15284,6 +15342,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 "
@@ -15293,7 +15351,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 "
@@ -15304,7 +15362,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 "
@@ -15315,8 +15373,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 "
@@ -15342,11 +15400,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
@@ -15356,6 +15414,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
@@ -15365,6 +15423,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
@@ -15387,6 +15445,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
@@ -15408,6 +15466,7 @@
 "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
@@ -15418,6 +15477,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
@@ -15434,21 +15493,23 @@
 #, 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 "
@@ -15483,8 +15544,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
@@ -15493,14 +15554,14 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"tentato di scaricare questo oggetto.<br><br>Il messaggio d''errore "
+"è:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15572,6 +15633,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"
@@ -15596,5 +15657,6 @@
 #: ../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
@@ -15768,5 +15830,6 @@
 #: ../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
@@ -15965,5 +16028,6 @@
 #: ../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/buildings_tools/src/buildings_tools/AddressDialog.java:36
@@ -16222,7 +16286,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16232,5 +16296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16240,5 +16304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16254,5 +16318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16262,5 +16326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16291,5 +16355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16298,5 +16362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16305,5 +16369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16312,5 +16376,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16319,5 +16383,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16326,5 +16390,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -16358,17 +16422,20 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"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."
+"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."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16572,5 +16639,6 @@
 #: ../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
@@ -16883,34 +16951,35 @@
 msgstr "Errore nella zona di Lambert della cache"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Usa"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Selezionare uno schema da usare."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Schema di colori"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Selezionare lo schema da eliminare."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Usa lo schema selezionato nella lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Usa i colori attuali come nuovo schema di colori."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Elimina lo schema selezionato nella lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Schemi di colore"
@@ -16986,5 +17055,5 @@
 msgstr "Livello per la modifica dei tracciati GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Converti in livello GPX con orario anonimo"
@@ -17075,4 +17144,5 @@
 msgstr "Porta:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -17285,5 +17355,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17404,5 +17474,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Numero massimo di segmenti permesso per ogni percorso generato. Predefinito "
@@ -17427,6 +17498,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Accuratezza della semplificazione lineare di Douglas-Peucker, misurata in "
@@ -17483,5 +17555,6 @@
 #: ../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
@@ -17727,7 +17800,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
@@ -17755,5 +17828,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "L''intestazione contiene troppi valori e non è possibile mapparla su una "
@@ -17869,5 +17943,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 "Sono presenti dei cambiamenti non salvati nella propria coda. Si desidera "
@@ -17922,5 +17997,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 "Scrivi le informazioni sulla posizione nelle intestazioni exif dei seguenti "
@@ -18326,5 +18402,6 @@
 #, 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
@@ -18756,4 +18833,12 @@
 msgstr "Complesso"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18805,6 +18890,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
@@ -18813,6 +18898,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
@@ -18863,5 +18948,6 @@
 #: ../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
@@ -18926,5 +19012,6 @@
 #: ../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
@@ -18994,6 +19081,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
@@ -19003,6 +19090,7 @@
 "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
@@ -19242,6 +19330,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 "
@@ -19341,13 +19429,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
@@ -19391,8 +19479,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
@@ -19407,14 +19495,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."
 
@@ -19531,8 +19619,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
@@ -19547,18 +19635,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
@@ -20221,10 +20309,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"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:744
@@ -20376,5 +20465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -20481,5 +20570,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr "Visualizza la posizione corrente nel video"
@@ -20545,6 +20634,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
@@ -20891,9 +20980,6 @@
 msgstr "File WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20904,10 +20990,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Database non in linea per manutenzione"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20918,16 +21004,16 @@
 "planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "non è possibile acquisire il flusso sonoro dall''URL di ingresso"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Periferica  Audio Non Disponibile"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
@@ -20935,10 +21021,10 @@
 "dati"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20946,17 +21032,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "foresta"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20964,7 +21050,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20974,5 +21060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -21015,5 +21101,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -21023,5 +21109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -21031,5 +21117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -21039,8 +21125,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -21054,5 +21140,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -21063,5 +21149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -21070,7 +21156,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -21080,5 +21166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -21088,5 +21174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -21096,5 +21182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -21104,5 +21190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -21112,5 +21198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -21120,5 +21206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -21128,8 +21214,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -21139,59 +21225,60 @@
 msgstr "itinerario"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Attributi opzionali:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Modificatori:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nome del file"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Scaletta"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Tipi di carburante:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Pagina iniziale"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "Taoista"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Ingrandisci"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nuova regola"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Crea un nuovo nodo."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Salva"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -21232,6 +21319,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
@@ -21279,5 +21366,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Scarica direttamente in JOSM i punti GPS dal registratore di dati Globalsat "
@@ -21481,6 +21569,13 @@
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21491,5 +21586,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21501,10 +21596,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21516,5 +21611,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21527,5 +21622,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21537,5 +21632,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21543,10 +21638,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 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:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21557,5 +21652,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22447,7 +22542,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -22587,8 +22682,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"/>
@@ -22798,5 +22893,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22806,5 +22901,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22823,5 +22918,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22831,5 +22926,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22848,5 +22943,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22856,5 +22951,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22873,5 +22968,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22881,5 +22976,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22894,5 +22989,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22910,5 +23005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22926,5 +23021,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22933,5 +23028,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22941,5 +23036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22959,5 +23054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22966,5 +23061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22974,5 +23069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -23676,5 +23771,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -23725,5 +23820,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -23820,5 +23915,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23986,5 +24081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -24318,5 +24413,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24326,5 +24421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24334,5 +24429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24342,5 +24437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24350,5 +24445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24358,5 +24453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24366,5 +24461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24375,5 +24470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25793,5 +25888,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25801,5 +25896,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25809,5 +25904,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25817,5 +25912,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -26179,7 +26274,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26189,5 +26284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26197,5 +26292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26205,5 +26300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26213,5 +26308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26221,5 +26316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26229,5 +26324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26237,5 +26332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26245,5 +26340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26253,5 +26348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26261,5 +26356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26269,5 +26364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26277,5 +26372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26285,5 +26380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26293,5 +26388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26301,5 +26396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26309,5 +26404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26317,5 +26412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26325,5 +26420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26333,5 +26428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26341,5 +26436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26349,5 +26444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26357,5 +26452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26365,5 +26460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26373,5 +26468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26381,5 +26476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26389,5 +26484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26397,5 +26492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26405,5 +26500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26413,5 +26508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26421,5 +26516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26429,5 +26524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26437,5 +26532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26445,5 +26540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26453,5 +26548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26461,5 +26556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26469,5 +26564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26477,5 +26572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26485,5 +26580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26493,5 +26588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26501,5 +26596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26509,5 +26604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26517,5 +26612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26525,5 +26620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26533,5 +26628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26541,5 +26636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26549,5 +26644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -28253,7 +28348,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28263,5 +28358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28271,5 +28366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28279,5 +28374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28287,5 +28382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28295,5 +28390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28303,5 +28398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28311,5 +28406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28319,5 +28414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -29741,5 +29836,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29755,5 +29850,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29763,5 +29858,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -29772,5 +29867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29783,7 +29878,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29793,5 +29888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29801,5 +29896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29809,5 +29904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29817,5 +29912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29849,5 +29944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29863,5 +29958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29871,5 +29966,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29878,5 +29973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29886,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29895,5 +29990,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29918,5 +30013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -30031,9 +30126,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
@@ -30041,5 +30136,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,
@@ -30049,8 +30144,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
@@ -30064,5 +30159,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -30070,5 +30165,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -30117,6 +30212,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>
@@ -30196,5 +30291,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30204,11 +30299,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -30224,5 +30319,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30231,5 +30326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30238,5 +30333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30252,5 +30347,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30264,5 +30359,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30271,5 +30366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30278,5 +30373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30285,5 +30380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30292,5 +30387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30299,5 +30394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30306,5 +30401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30313,5 +30408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30320,5 +30415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30327,5 +30422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30334,5 +30429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30341,5 +30436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30348,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30355,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -30362,5 +30457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -30537,7 +30632,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30551,5 +30646,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30559,7 +30654,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30569,5 +30664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30577,5 +30672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30585,5 +30680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30593,5 +30688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -30607,5 +30702,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30614,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30622,5 +30717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30629,5 +30724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30636,5 +30731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30643,5 +30738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30650,5 +30745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30657,5 +30752,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30664,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30671,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30678,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30685,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -30697,5 +30792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -30709,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30716,5 +30811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -30728,5 +30823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -30741,5 +30836,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -30754,5 +30849,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -30766,5 +30861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -30778,5 +30873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30785,5 +30880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30792,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30800,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30807,5 +30902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30814,5 +30909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30821,5 +30916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30829,5 +30924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30838,5 +30933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30846,7 +30941,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30856,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30864,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30872,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30881,5 +30976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30888,5 +30983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30896,5 +30991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30904,5 +30999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30912,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30920,5 +31015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30928,5 +31023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30936,5 +31031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30944,5 +31039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30952,5 +31047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30960,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30981,5 +31076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30994,7 +31089,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -31004,5 +31099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -31011,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -31019,5 +31114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -31026,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -31034,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -31042,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -31056,5 +31151,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -31065,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -31082,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -31090,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31101,5 +31196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31118,5 +31213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -31125,5 +31220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -31132,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -31139,7 +31234,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -31150,5 +31245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -31163,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -31175,5 +31270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -31183,5 +31278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -31195,5 +31290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -31207,5 +31302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31214,5 +31309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31221,7 +31316,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31231,5 +31326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31239,5 +31334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31247,5 +31342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31255,5 +31350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31263,5 +31358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -31277,7 +31372,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -31292,5 +31387,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -31305,5 +31400,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -31318,5 +31413,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -31331,5 +31426,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -31344,5 +31439,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -31357,7 +31452,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31367,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31374,5 +31469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31382,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31390,5 +31485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31398,5 +31493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31406,5 +31501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31414,5 +31509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31422,5 +31517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31430,5 +31525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31438,5 +31533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31446,5 +31541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31454,5 +31549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31462,5 +31557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -31480,5 +31575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -31493,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -31504,7 +31599,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31514,5 +31609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31522,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31530,5 +31625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31538,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31546,5 +31641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31554,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31562,5 +31657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31570,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31578,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31586,5 +31681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31594,5 +31689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31602,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31610,5 +31705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31618,5 +31713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31626,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31634,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -31654,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -31666,7 +31761,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31676,5 +31771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31684,5 +31779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31692,5 +31787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31700,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31708,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31716,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31724,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31732,5 +31827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31740,5 +31835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31748,5 +31843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -31765,5 +31860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31773,5 +31868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31781,5 +31876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31789,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31797,5 +31892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31805,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31813,5 +31908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31821,5 +31916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31829,5 +31924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31837,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31845,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31853,5 +31948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31870,5 +31965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31877,5 +31972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31885,5 +31980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31892,5 +31987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31900,5 +31995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31908,5 +32003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31916,5 +32011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31923,5 +32018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31931,5 +32026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31939,5 +32034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31947,5 +32042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31955,5 +32050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31962,5 +32057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31969,5 +32064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31976,5 +32071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31983,5 +32078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31990,5 +32085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31997,5 +32092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -32004,5 +32099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -32011,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -32018,5 +32113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -32025,5 +32120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -32032,5 +32127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -32039,5 +32134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -32046,5 +32141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -32054,5 +32149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -32062,5 +32157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -32070,5 +32165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -32078,5 +32173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -32086,5 +32181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -32094,5 +32189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -32102,5 +32197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -32110,5 +32205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -32118,5 +32213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -32127,5 +32222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -32135,5 +32230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -32143,5 +32238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -32151,5 +32246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -32159,5 +32254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -32167,5 +32262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -32175,5 +32270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -32183,5 +32278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32191,5 +32286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32199,5 +32294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32207,5 +32302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32215,5 +32310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32223,5 +32318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32231,5 +32326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32239,5 +32334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32247,5 +32342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -32255,5 +32350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32263,5 +32358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32271,5 +32366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32279,5 +32374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32286,5 +32381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -32316,5 +32411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32324,5 +32419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32332,7 +32427,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -32347,5 +32442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32355,5 +32450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32363,5 +32458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32371,5 +32466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32379,5 +32474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32387,5 +32482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32395,5 +32490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -32409,7 +32504,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32419,5 +32514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32427,5 +32522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32435,5 +32530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32443,5 +32538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32451,5 +32546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32459,5 +32554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32467,5 +32562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32475,5 +32570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32483,5 +32578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32491,5 +32586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32499,5 +32594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32507,5 +32602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32515,5 +32610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32523,5 +32618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32531,5 +32626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32539,5 +32634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32547,5 +32642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32555,5 +32650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32563,5 +32658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32571,5 +32666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32579,5 +32674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32587,5 +32682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32595,5 +32690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32603,5 +32698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32611,5 +32706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32619,5 +32714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32627,5 +32722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32635,5 +32730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32643,5 +32738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32651,5 +32746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32659,5 +32754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32667,5 +32762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32675,5 +32770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32683,5 +32778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32691,5 +32786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32699,5 +32794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32707,5 +32802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32715,5 +32810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32723,5 +32818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32731,5 +32826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32739,5 +32834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32747,5 +32842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -32781,7 +32876,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32791,5 +32886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32799,5 +32894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32807,5 +32902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32815,5 +32910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32823,5 +32918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32831,5 +32926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32839,5 +32934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32854,5 +32949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32862,5 +32957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32870,5 +32965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32878,5 +32973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32886,5 +32981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32894,5 +32989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32903,5 +32998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32911,5 +33006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32919,5 +33014,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32927,5 +33022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32934,5 +33029,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32941,5 +33036,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32957,7 +33052,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32967,5 +33062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32975,5 +33070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32983,5 +33078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32991,5 +33086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32999,5 +33094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -33007,5 +33102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -33015,5 +33110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -33023,5 +33118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -33031,5 +33126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -33047,5 +33142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -33059,5 +33154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -33071,5 +33166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -33079,5 +33174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -33091,5 +33186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -33103,6 +33198,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -33112,5 +33207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -33124,5 +33219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -33136,5 +33231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -33148,5 +33243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -33160,5 +33255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -33172,5 +33267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -33180,7 +33275,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33190,5 +33285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33198,5 +33293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33206,5 +33301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33214,5 +33309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -33229,5 +33324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -33240,5 +33335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -33252,5 +33347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -33264,5 +33359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -33276,5 +33371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33285,5 +33380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33293,5 +33388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33301,5 +33396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33309,5 +33404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33317,5 +33412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -33332,5 +33427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -33344,5 +33439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -33356,5 +33451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -33368,5 +33463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -33380,5 +33475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -33393,5 +33488,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?
@@ -33417,5 +33512,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33426,11 +33521,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33440,5 +33535,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33448,5 +33543,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33456,5 +33551,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33464,5 +33559,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33472,5 +33567,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33480,5 +33575,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33488,5 +33583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33496,5 +33591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33504,5 +33599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33512,5 +33607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33520,5 +33615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33528,5 +33623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -33546,5 +33641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -33639,5 +33734,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -33645,28 +33740,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
@@ -33781,5 +33876,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33792,5 +33887,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>
@@ -33815,6 +33910,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33823,6 +33918,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33837,6 +33932,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
@@ -33850,6 +33945,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
@@ -33869,6 +33964,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33892,6 +33987,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
@@ -33941,4 +34036,5 @@
 #~ msgstr "Cambia"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Risolvere {0} conflitti in {1} oggetti"
@@ -33956,4 +34052,5 @@
 #~ msgstr "falso"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33980,6 +34077,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 "
@@ -34018,7 +34115,8 @@
 #~ 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 (,)."
-
+#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse oppure "
+#~ "premere Ctrl e le frecce, il punto (.) e la virgola (,)."
+
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Immagini per {0}"
@@ -34027,7 +34125,9 @@
 #~ 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}"
@@ -34036,10 +34136,13 @@
 #~ 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"
@@ -34053,4 +34156,5 @@
 #~ msgstr[1] "immagini"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} in questa traccia."
@@ -34059,7 +34163,9 @@
 #~ 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}\"."
@@ -34081,6 +34187,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34099,4 +34204,7 @@
 #~ msgid "File not found"
 #~ msgstr "File non trovato"
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Crea marcatori non-audio quando leggi un file GPX."
 
 #~ msgid "Update"
@@ -34138,7 +34246,8 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
-#~ "sul server."
-
+#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati sul "
+#~ "server."
+
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
@@ -34159,4 +34268,5 @@
 #~ msgstr "Unire i nodi con diffenti appartenenze?"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Errore durante il caricamento della pagina {0}"
@@ -34169,6 +34279,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 "
@@ -34228,9 +34338,8 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still want "
+#~ "to merge them?"
 #~ msgstr ""
-#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
+#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?"
 
 #~ msgid "Expected closing parenthesis."
@@ -34267,6 +34376,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"
@@ -34309,4 +34418,5 @@
 #~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usa la preimpostazione ''{0}''"
@@ -34316,6 +34426,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 "
@@ -34337,7 +34447,9 @@
 #~ 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}\""
@@ -34357,10 +34469,11 @@
 
 #~ 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."
-
+#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM ha "
+#~ "i permessi per sovrascrivere quelle esistenti."
+
+#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -34368,4 +34481,5 @@
 #~ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -34377,4 +34491,5 @@
 #~ "{0}"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Estensione non trovata: {0}."
@@ -34420,4 +34535,5 @@
 #~ msgstr "Cycleway"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
@@ -34437,6 +34553,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"
@@ -34482,4 +34598,5 @@
 #~ 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}"
@@ -34490,6 +34607,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"
@@ -34509,9 +34626,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."
@@ -34531,4 +34648,5 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Impossibile leggere \"{0}\""
@@ -34548,6 +34666,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 "
@@ -34564,6 +34682,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"
@@ -34575,6 +34693,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"
@@ -34586,9 +34704,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"
@@ -34600,11 +34718,12 @@
 #~ 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"
@@ -34626,4 +34745,5 @@
 #~ msgstr "Membro vuoto nella relazione."
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
@@ -34644,22 +34764,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 "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}"
@@ -34674,27 +34801,29 @@
 #~ 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}\""
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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}"
@@ -34713,8 +34842,8 @@
 #~ 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."
@@ -34749,6 +34878,5 @@
 #~ 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)"
@@ -34758,4 +34886,5 @@
 #~ msgstr "File cache della zona 2 di Lambert (.2)"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Collegamento a {0} in corso..."
@@ -34767,6 +34896,6 @@
 #~ msgstr "Aggiunta l'auto-etichettatura della sorgente:"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert "
@@ -34779,4 +34908,5 @@
 #~ msgstr "Elimina gli elementi selezionati"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -34801,7 +34931,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."
-
+#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di caricarlo."
+
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relazione: {0}"
@@ -34820,4 +34950,5 @@
 #~ msgstr "Sposta in basso"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34830,4 +34961,5 @@
 #~ msgstr "Aggiorna dati"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Modificare prima la proiezione in {0}."
@@ -34836,4 +34968,5 @@
 #~ 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}"
@@ -34843,10 +34976,11 @@
 
 #~ 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"
@@ -34880,6 +35014,5 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
 #~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o "
@@ -34889,4 +35022,7 @@
 #~ msgstr ""
 #~ "Sono stati rilevati i seguenti errori durante lo scaricamento di massa:"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Errori durante lo scaricamento"
 
 #~ msgid "Edit Information Office"
@@ -34906,7 +35042,6 @@
 #~ "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."
@@ -34914,14 +35049,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 "
@@ -34930,11 +35065,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"
@@ -34944,4 +35079,5 @@
 #~ msgstr "<multiplo>"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34950,6 +35086,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}"
@@ -34966,4 +35102,5 @@
 #~ "modifiche"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34993,11 +35130,14 @@
 #~ 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}"
@@ -35026,4 +35166,5 @@
 #~ msgstr "Selezionare un nodo iniziale alla fine di un percorso"
 
+#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr ""
@@ -35083,4 +35224,5 @@
 #~ msgstr "Primitive eliminate o spostate"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "rimozione del riferimento dal percorso {0}"
@@ -35089,21 +35231,24 @@
 #~ 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)"
@@ -35117,6 +35262,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 "
@@ -35132,6 +35277,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"
@@ -35141,6 +35286,5 @@
 #~ 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, "
@@ -35156,7 +35300,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"
@@ -35171,22 +35315,26 @@
 #~ 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"
-
+#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} "
+#~ "delle {1} primitive selezionate"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -35207,11 +35355,14 @@
 #~ 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 ""
@@ -35220,12 +35371,12 @@
 #~ msgid "The plugin could not be removed. Probably it was already disabled"
 #~ msgstr ""
-#~ "L''estensione non può essere rimossa. Probabilmente è stata già "
-#~ "disabilitata"
-
+#~ "L''estensione non può essere rimossa. Probabilmente è stata già disabilitata"
+
+#, java-format
 #~ 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"
@@ -35239,6 +35390,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, "
@@ -35246,4 +35397,5 @@
 #~ "modificata"
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -35251,9 +35403,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"
@@ -35263,13 +35415,15 @@
 #~ 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>."
@@ -35277,19 +35431,23 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
-#~ "<A HREF=\"{1}\">la propria lingua</A>."
-
+#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure <A "
+#~ "HREF=\"{1}\">la propria lingua</A>."
+
+#, java-format
 #~ 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}."
@@ -35304,13 +35462,17 @@
 #~ 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}"
@@ -35319,20 +35481,23 @@
 #~ 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}''"
-
+#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
+#~ "''{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 ""
 #~ "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}''"
@@ -35340,7 +35505,8 @@
 #~ 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"
-
+#~ "Sostituisci il percorso a cui fa riferimento questo membro con il percorso "
+#~ "unito"
+
+#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "Era atteso ID >= 0. Ottenuto {0}."
@@ -35350,10 +35516,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"
@@ -35362,25 +35528,35 @@
 #~ msgstr "Sostituisci"
 
+#~ msgid "Apply also for children"
+#~ msgstr "Applica anche ai figli"
+
 #~ msgid "Bikes"
 #~ 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}\""
-
+#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\""
+
+#, java-format
 #~ 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"
@@ -35390,9 +35566,11 @@
 #~ 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}''."
-
+#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo "
+#~ "0..{1}. Ottenuto ''{2}''."
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "il parametro ''{0}'' non deve essere vuoto."
@@ -35401,12 +35579,14 @@
 #~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "il parametro ''{0}'' non deve essere nullo"
 
+#, 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 ""
@@ -35414,18 +35594,20 @@
 #~ "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>"
-
+#~ "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
 #~ 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"
-
+#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è più "
+#~ "presente"
+
+#, java-format
 #~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
-
+#~ msgstr "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
+
+#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
@@ -35436,6 +35618,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"
@@ -35448,13 +35630,17 @@
 #~ "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}"
@@ -35471,49 +35657,54 @@
 #~ 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"
-
+#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da caricare. "
+#~ "Ritorno alla versione 0.6"
+
+#, 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 ""
 #~ "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."
-
+#~ "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
 #~ 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}''''."
-
+#~ "Tipo di membro di relazione ''''{0}'''' sconosciuto nella relazione con ID "
+#~ "esterno ''''{1}''''."
+
+#, java-format
 #~ 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}''."
@@ -35523,4 +35714,5 @@
 #~ "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}''''"
@@ -35531,21 +35723,24 @@
 #~ "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."
-
+#~ "<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
 #~ 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>"
-
+#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si desidera "
+#~ "veramente applicare il nuovo ruolo?</html>"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -35555,4 +35750,5 @@
 #~ "manca la codifica ''''{0}''''.</html>"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 #~ msgstr ""
@@ -35562,13 +35758,15 @@
 #~ 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 "
@@ -35582,13 +35780,15 @@
 #~ 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>"
 
@@ -35596,4 +35796,5 @@
 #~ msgstr "Imposta manualmente la zona di Lambert"
 
+#, java-format
 #~ msgid ""
 #~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
@@ -35607,42 +35808,49 @@
 #~ "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>"
-
+#~ "<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
 #~ 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}"
-
+#~ "Erano attesi esattamente quattro numeri in doppia precisione nella stringa, "
+#~ "ottenuto {0}"
+
+#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -35657,18 +35865,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 "
@@ -35676,20 +35884,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>"
-
+#~ "predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà il "
+#~ "posto del percorso originale nell'appartenenza.</html>"
+
+#, java-format
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 #~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
@@ -35700,4 +35908,5 @@
 #~ "differenti"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
@@ -35711,7 +35920,9 @@
 #~ 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 ""
@@ -35719,9 +35930,11 @@
 #~ "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."
-
+#~ "Valore non corretto dell''operatore del gruppo di modifiche: {0}. Era atteso "
+#~ "un numero."
+
+#, java-format
 #~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
 #~ msgstr ""
@@ -35732,7 +35945,9 @@
 #~ 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}."
@@ -35743,26 +35958,26 @@
 #~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
 #~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</"
-#~ "a>)"
-
+#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</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 ""
 #~ "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>"
-
+#~ "ritornare alla finestra di caricamento.<br>Cliccare ''<strong>{2}</strong>'' "
+#~ "per interrompere il caricamento e ritornare a modificare la mappa.<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 ""
-#~ "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}''''."
 
@@ -35770,11 +35985,13 @@
 #~ 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}"
-
+#~ msgstr "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
+
+#, java-format
 #~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
 #~ msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
@@ -35786,20 +36003,24 @@
 #~ 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}"
-
+#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro ''''{0}'''', "
+#~ "ottenuto {1}"
+
+#, java-format
 #~ 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}"
-
+#~ "Attenzione: ignorato il gruppo di modifiche con id {0} per il nuovo oggetto "
+#~ "con id esterno {1} e con id interno {2}"
+
+#, java-format
 #~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
 #~ msgstr ""
@@ -35807,11 +36028,13 @@
 #~ "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 "
 #~ "corrente di JOSM. L''eccezione è stata: {0}"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -35824,4 +36047,5 @@
 #~ msgstr "Numero errato di parametri per l''operatore tags."
 
+#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -35831,4 +36055,5 @@
 #~ "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."
@@ -35838,7 +36063,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 ""
@@ -35849,16 +36074,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"
@@ -35898,4 +36123,8 @@
 #~ msgstr "<numero>"
 
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
 #~ msgid " Video"
 #~ msgstr " Video"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-02 04:00+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-07 03:35+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-02 08:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -91,5 +91,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -101,6 +101,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
@@ -197,6 +196,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
@@ -206,6 +205,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
@@ -215,6 +214,5 @@
 "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
@@ -243,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -252,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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -266,6 +264,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -301,7 +299,5 @@
 #: ../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
@@ -322,9 +318,7 @@
 #, 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 +341,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
@@ -440,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -598,6 +592,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
@@ -644,7 +637,5 @@
 "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,12 +643,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -787,6 +778,5 @@
 #: ../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
@@ -918,6 +908,5 @@
 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
@@ -962,7 +951,5 @@
 "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
@@ -1064,6 +1051,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
@@ -1104,7 +1090,5 @@
 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
@@ -1217,13 +1201,10 @@
 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
@@ -1287,9 +1268,7 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"<h3>いくつかのウェイが選択されているときに、９０度ないしは１８０度に形状が調"
-"整されました。</h3>セレクションに二つのノードを追加できます。そして、その２つ"
-"のノードを基準として、方向を修正できます。（その後、そのノードの移動を取り消"
-"しできます）：<br>ノードを選択して、Orthogonalize/Undoのショートカットを選択"
-"してください。既定はShift-Qです。"
+"<h3>いくつかのウェイが選択されているときに、９０度ないしは１８０度に形状が調整されました。</h3>セレクションに二つのノードを追加できます。そして、"
+"その２つのノードを基準として、方向を修正できます。（その後、そのノードの移動を取り消しできます）：<br>ノードを選択して、Orthogonalize/U"
+"ndoのショートカットを選択してください。既定はShift-Qです。"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1333,7 +1312,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
@@ -1358,7 +1337,5 @@
 "<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
@@ -1394,6 +1371,5 @@
 "incomplete primitives?"
 msgstr ""
-"コピーしたデータは不完全なプリミティブを含んでいます。貼り付けると不完全なプ"
-"リミティブが削除されます。データを不完全なプリミティブ抜きで貼り付けますか？"
+"コピーしたデータは不完全なプリミティブを含んでいます。貼り付けると不完全なプリミティブが削除されます。データを不完全なプリミティブ抜きで貼り付けますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1404,6 +1380,5 @@
 #: ../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
@@ -1459,5 +1434,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1478,5 +1454,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1582,7 +1558,5 @@
 "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
@@ -1618,7 +1592,5 @@
 "Select all undeleted objects in the data layer. This selects incomplete "
 "objects too."
-msgstr ""
-"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ"
-"ジェクトも選択します。"
+msgstr "データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブジェクトも選択します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
@@ -1628,5 +1600,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する"
 
@@ -1648,5 +1621,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1750,7 +1723,5 @@
 "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
@@ -1766,6 +1737,5 @@
 #: ../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
@@ -1773,7 +1743,5 @@
 "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
@@ -1782,6 +1750,5 @@
 "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
@@ -1790,6 +1757,5 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これ"
-"らを確認して必要なら訂正してください。</html>"
+"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1850,5 +1816,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
 
@@ -1856,12 +1823,10 @@
 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
@@ -1872,8 +1837,6 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくら"
-"れます。\n"
-"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身"
-"の\n"
+"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくられます。\n"
+"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身の\n"
 "コピーが作られ、全てのノードが選択状態になります。"
 
@@ -1920,9 +1883,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 +1902,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -1997,6 +1960,5 @@
 "''{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
@@ -2181,7 +2143,5 @@
 "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
@@ -2213,7 +2173,5 @@
 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
@@ -2232,7 +2190,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "ダウンロード中にエラーが発生しました"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "ダウンロード中にエラー"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2264,7 +2222,7 @@
 msgstr "({0}/{1}) リレーション {2} の親をロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "ダウンロード中にエラー"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2293,6 +2251,5 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに"
-"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
+"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときにノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
@@ -2387,7 +2344,5 @@
 "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
@@ -2397,9 +2352,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
@@ -2444,6 +2399,5 @@
 "Really move them?"
 msgstr ""
-"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間"
-"違いでしょう。\n"
+"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間違いでしょう。\n"
 "本当に移動しますか？"
 
@@ -2455,7 +2409,5 @@
 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
@@ -2468,6 +2420,5 @@
 "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
@@ -2485,6 +2436,5 @@
 "move zoom with right button"
 msgstr ""
-"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら"
-"移動; 右ドラッグによるズーム"
+"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら移動; 右ドラッグによるズーム"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2524,146 +2474,137 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "検索..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "オブジェクトを検索"
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "フィルター文字列を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "検索文字列を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "検索表現を入力"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "セレクションを置換"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "セレクションに加える"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "セレクションの削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "選択範囲の中から見つける"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "大/小文字を区別する"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "正規表現検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-"<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリー"
-"ト'' を両方含むもの"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr "<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリート'' を両方含むもの"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-"<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' "
-"を含むもの。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgstr "<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' を含むもの。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - nameタグに ''Bak'' を含むもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> -  キー ''type'' の値が ''route'' であるもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> -  ''type'' というキーを持つもの全て。* は任意の文字列を意味し"
-"ます。<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<b>type=*</b> -  ''type'' というキーを持つもの全て。* は任意の文字列を意味します。<b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - name に\"Bak'' を含まない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes もしくは true, 1, on のオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=任意の値を入力してください."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊なターゲット:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgstr "<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - 該当ユーザに変更された全オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - 匿名ユーザによって変更された全てのオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - オブジェクトに与えられた ID (0 は新しいオブジェクト)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
 "assigned version)"
-msgstr ""
-"<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョン番号のな"
-"いオブジェクトは0）"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+msgstr "<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョン番号のないオブジェクトは0）"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
 "assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - 変更セットIDのオブジェクト（変更セットに含まれていない"
-"オブジェクトは0)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<b>nodes:</b>... - 指定した数のノードをもつオブジェクト（nodes:数 または "
-"nodes:最小-最大で指定）"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgstr "<b>changeset:</b>... - 変更セットIDのオブジェクト（変更セットに含まれていないオブジェクトは0)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr "<b>nodes:</b>... - 指定した数のノードをもつオブジェクト（nodes:数 または nodes:最小-最大で指定）"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
 "max)"
-msgstr ""
-"<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:"
-"最小値-最大値)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+msgstr "<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:最小値-最大値)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2673,55 +2614,53 @@
 "12T14:51:09Z</b>、<b>2009-11-12</b>　や <b>T14:51</b> 等)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - 変更されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b>- すべての不完全なオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - タグの無いオブジェクト全て"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"文字列に引用符をつける場合は<b>\"</b> を使ってください（キーが<b>:</b>を含む"
-"場合など）"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+msgstr "文字列に引用符をつける場合は<b>\"</b> を使ってください（キーが<b>:</b>を含む場合など）"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"引用符で囲った文字列に <b>\"</b> か <b>\\</b> を含むときには、<b>\\</b> を加"
-"えてエスケープしてください。(<b>\\\"</b> 及び <b>\\\\</b>）。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+"引用符で囲った文字列に <b>\"</b> か <b>\\</b> を含むときには、<b>\\</b> を加えてエスケープしてください。(<b>\\"
+"\"</b> 及び <b>\\\\</b>）。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2729,38 +2668,38 @@
 msgstr "フィルター"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "フィルターを登録"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "検索開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "\"{0}\"にマッチするものが見つからない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}'' を検索しましたが、選択からは何も取り除いていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "選択の中に \"{0}\" と一致するものは見つかりませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2768,5 +2707,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2774,5 +2713,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2780,5 +2719,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2792,59 +2731,57 @@
 "{2}"
 msgstr ""
-"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
-"セージは:\n"
+"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッセージは:\n"
 "\n"
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく"
-"ださい: key=value"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+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\"です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+msgstr "プリミティブの種類が不明です: {0}. 許される値は、\"node\", \"way\" そして \"relation\"です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "予期しないトークンです。{0}を期待してましたが、{1}を受け取りました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "予想外のトークン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "ORのパラメータが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "NOTに対する演算子が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "プリミティブIDを期待"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "予期される数字の範囲"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "変更セットIDを期待"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "バージョンを期待"
@@ -2854,6 +2791,5 @@
 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
@@ -2862,7 +2798,5 @@
 "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
@@ -2873,6 +2807,5 @@
 #, 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
@@ -2891,7 +2824,6 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
-"<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消"
-"してください。</html>"
+"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。<br>JOSM "
+"はこれをアップロードできません。リレーションを編集して相互依存を解消してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2915,5 +2847,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3025,6 +2957,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
@@ -3038,7 +2970,5 @@
 "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
@@ -3053,6 +2983,5 @@
 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
@@ -3070,7 +2999,5 @@
 #: ../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
@@ -3123,11 +3050,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:459
@@ -3179,7 +3105,5 @@
 "Warning: Purging way {0} because number of nodes dropped below 2. Current is "
 "{1}"
-msgstr ""
-"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、"
-"{1} です。"
+msgstr "警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、{1} です。"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:168
@@ -3257,7 +3181,5 @@
 "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
@@ -3341,7 +3263,5 @@
 "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
@@ -3350,7 +3270,5 @@
 "<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
@@ -3359,6 +3277,5 @@
 "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
@@ -3367,7 +3284,5 @@
 "<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
@@ -3375,7 +3290,5 @@
 msgid ""
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
-"警告: 初期設定ファイル ''{0}'' がありません。デフォルトの初期設定ファイルを作"
-"成します。"
+msgstr "警告: 初期設定ファイル ''{0}'' がありません。デフォルトの初期設定ファイルを作成します。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3384,6 +3297,5 @@
 "Warning: Replacing existing preference file ''{0}'' with default preference "
 "file."
-msgstr ""
-"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
+msgstr "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3392,16 +3304,14 @@
 "<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>に取って、新しい初期設定ファイルを作ります。</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>に取って、新しい初期設定ファイルを作ります。</htm"
+"l>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3410,7 +3320,5 @@
 "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
@@ -3423,6 +3331,5 @@
 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
@@ -3450,6 +3357,5 @@
 "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
@@ -3458,7 +3364,5 @@
 "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
@@ -3489,5 +3393,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3496,5 +3400,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3503,5 +3407,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3538,5 +3442,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3545,7 +3449,6 @@
 "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
@@ -3589,11 +3492,10 @@
 "Keeping target object. "
 msgstr ""
-"ソースオブジェクトが古いバージョン{2}が不可視であっても、対象となるid {0}で"
-"バージョン{1}のオブジェクトは可視になります。この一貫性の矛盾を扱うことはでき"
-"ません。対象オブジェクトを維持します。 "
+"ソースオブジェクトが古いバージョン{2}が不可視であっても、対象となるid "
+"{0}でバージョン{1}のオブジェクトは可視になります。この一貫性の矛盾を扱うことはできません。対象オブジェクトを維持します。 "
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3601,5 +3503,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3607,17 +3509,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "テキスト"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "摂氏"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3625,5 +3521,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3632,5 +3528,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3638,5 +3534,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3644,5 +3540,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3650,64 +3546,59 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>有効なフィルタ</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 件の非表示オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 件の無効化オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, 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:1140
+msgstr "変更セットID > 0 は新しいプリミティブには割り当てられません。変更セットの値は {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 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:1142
+msgstr "結合できません。なぜなら、処理しようとしているプリミティブが片方は新規で、もう一方は新規ではないためです。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, 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
@@ -3746,7 +3637,5 @@
 "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
@@ -3758,5 +3647,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを比較できません。"
 
@@ -3766,81 +3656,81 @@
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "領域を指定するウェイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "経由地かウェイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3916,6 +3806,5 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。"
-"NTF<->RGF93 グリッドを読み込めません。"
+"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。NTF<->RGF93 グリッドを読み込めません。"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -4016,7 +3905,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
@@ -4085,5 +3974,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4093,5 +3982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4100,5 +3989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4107,5 +3996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4114,5 +4003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4121,5 +4010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4128,9 +4017,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4245,6 +4134,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
@@ -4285,7 +4173,5 @@
 "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
@@ -4294,6 +4180,5 @@
 "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
@@ -4301,7 +4186,5 @@
 "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
@@ -4394,6 +4277,5 @@
 "megabytes"
 msgstr ""
-"お知らせ: いくつかの作業で、JOSM は大量のメモリを消費します。JOSM起動時に以下"
-"のJavaオプションを使用して\n"
+"お知らせ: いくつかの作業で、JOSM は大量のメモリを消費します。JOSM起動時に以下のJavaオプションを使用して\n"
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
@@ -4406,6 +4288,5 @@
 "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
@@ -4451,6 +4332,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4465,4 +4346,5 @@
 msgstr "編集"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4564,7 +4446,5 @@
 "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:298
@@ -4613,6 +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
@@ -4623,6 +4503,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
@@ -4662,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:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4681,7 +4561,5 @@
 "<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
@@ -4701,10 +4579,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
@@ -4730,10 +4608,9 @@
 #: ../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"
@@ -4742,5 +4619,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"
@@ -4749,5 +4626,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"
@@ -4812,7 +4689,5 @@
 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
@@ -4832,7 +4707,5 @@
 "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
@@ -4869,7 +4742,5 @@
 "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
@@ -4920,7 +4791,5 @@
 "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
@@ -4953,6 +4822,5 @@
 "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
@@ -4960,6 +4828,5 @@
 "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
@@ -4969,5 +4836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr "相手の選択した要素を、結合された要素リストの最後にコピー"
 
@@ -4976,6 +4844,5 @@
 "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
@@ -4983,6 +4850,5 @@
 "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
@@ -4994,6 +4860,7 @@
 msgstr "すべての要素を対象にコピーする"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5005,5 +4872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "下"
@@ -5048,18 +4915,14 @@
 #, 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
@@ -5087,6 +4950,5 @@
 "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
@@ -5107,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>"
 
@@ -5134,6 +4996,5 @@
 "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
@@ -5150,6 +5011,5 @@
 "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
@@ -5165,7 +5025,5 @@
 "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
@@ -5263,6 +5121,5 @@
 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
@@ -5284,6 +5141,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
@@ -5332,6 +5189,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5344,6 +5201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5567,7 +5424,5 @@
 "<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
@@ -5578,6 +5433,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>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
+msgstr "<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5589,7 +5443,5 @@
 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
@@ -5602,9 +5454,7 @@
 "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
@@ -5648,10 +5498,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>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>"
-msgstr ""
-"<html>選択すると現在選択しているオブジェクトの変更セットだけを表示。<br>選択"
-"を解除するとデータレイヤ内のオブジェクト全ての変更セットを表示。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5675,5 +5525,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr "OSMサーバから選択された変更セットについての情報をダウンロード"
 
@@ -5691,6 +5542,5 @@
 msgstr "選択された変更セットそれぞれにウェブページを開く"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5714,5 +5564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5720,5 +5570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5791,9 +5641,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5811,13 +5662,13 @@
 msgstr "''{0}'' の競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5826,45 +5677,41 @@
 msgstr "追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "フィルターを追加。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "フィルターを編集。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "フィルターを削除。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "フィルターを上に移動。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "フィルターを下に移動。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "フィルターを有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "要素を非表示にする"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "子へも適用"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "反転フィルター"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "フィルターモード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6091,10 +5938,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
@@ -6132,7 +5979,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
@@ -6168,6 +6013,5 @@
 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
@@ -6176,7 +6020,5 @@
 "<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
@@ -6275,6 +6117,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
@@ -6391,7 +6233,5 @@
 "<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
@@ -6442,4 +6282,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7344,7 +7185,5 @@
 "<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
@@ -7352,6 +7191,5 @@
 "Zoom to the primitives in the content of this changeset in the current data "
 "layer"
-msgstr ""
-"現在のデータレイヤー中のこの変更セットのコンテンツ内のプリミティブにズーム"
+msgstr "現在のデータレイヤー中のこの変更セットのコンテンツ内のプリミティブにズーム"
 
 #. parent for dialog is Main.parent
@@ -7452,6 +7290,5 @@
 "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
@@ -7510,6 +7347,5 @@
 "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
@@ -7517,7 +7353,5 @@
 "<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
@@ -7529,6 +7363,5 @@
 "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
@@ -7536,7 +7369,5 @@
 "<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
@@ -7554,6 +7385,5 @@
 "<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
@@ -7564,9 +7394,7 @@
 #, 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
@@ -7576,6 +7404,5 @@
 "{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
@@ -7587,19 +7414,16 @@
 "<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
@@ -7632,7 +7456,5 @@
 "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
@@ -7714,7 +7536,5 @@
 "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
@@ -7722,5 +7542,5 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7728,23 +7548,23 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "空の値でタグを削除します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7752,5 +7572,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7758,77 +7578,81 @@
 msgstr[0] "これにより、{0} 個のオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "選択したオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
@@ -7875,6 +7699,5 @@
 "<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
@@ -7900,6 +7723,5 @@
 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
@@ -7943,10 +7765,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
@@ -7963,10 +7784,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
@@ -7981,18 +7801,16 @@
 "''{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
@@ -8000,7 +7818,5 @@
 "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
@@ -8008,7 +7824,5 @@
 "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
@@ -8032,6 +7846,5 @@
 "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
@@ -8100,6 +7913,5 @@
 "was open. They have been removed from the relation members list."
 msgstr ""
-"リレーションエディタのオープン中にこの新しいリレーションのメンバーがいくつか"
-"削除されました。\n"
+"リレーションエディタのオープン中にこの新しいリレーションのメンバーがいくつか削除されました。\n"
 "それらはリレーションメンバーリストから削除されました。"
 
@@ -8128,15 +7940,16 @@
 "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
@@ -8326,7 +8139,5 @@
 "<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
@@ -8341,7 +8152,5 @@
 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
@@ -8383,7 +8192,5 @@
 "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
@@ -8444,6 +8251,5 @@
 "into the currently active data layer.</html>"
 msgstr ""
-"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現"
-"在の有効なデータレイヤーにダウンロード。</html>"
+"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現在の有効なデータレイヤーにダウンロード。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
@@ -8474,9 +8280,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> <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
@@ -8535,4 +8342,5 @@
 msgstr "ネームサーバに問合せ中 ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8617,13 +8425,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>"
-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
@@ -8632,10 +8439,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
@@ -8645,6 +8452,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
@@ -8668,6 +8475,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>のヘルプ項目だけ可能です。</html>"
+"<html>現在のURLの<tt>{0}</tt><br>は外部URLです。編集は、ヘルプサーバ<tt>{1}</tt>のヘルプ項目だけ可能です。</ht"
+"ml>"
 
 #. putValue(NAME, tr("Reload"));
@@ -8737,6 +8544,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
@@ -8762,7 +8568,5 @@
 "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
@@ -8827,6 +8631,5 @@
 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
@@ -8834,6 +8637,5 @@
 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
@@ -8882,7 +8684,5 @@
 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
@@ -8891,7 +8691,5 @@
 "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
@@ -8921,17 +8719,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>アップロード<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
@@ -8945,13 +8742,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
@@ -8962,7 +8759,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
@@ -8991,8 +8787,7 @@
 "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
@@ -9107,7 +8902,5 @@
 "Warning: failed to put Credential Dialog always on top. Caught security "
 "exception."
-msgstr ""
-"警告: 信用証明ダイアログを常時トップに配置するのに失敗。セキュリティ例外を捕"
-"捉しました。"
+msgstr "警告: 信用証明ダイアログを常時トップに配置するのに失敗。セキュリティ例外を捕捉しました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -9136,6 +8929,5 @@
 "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
@@ -9156,7 +8948,5 @@
 "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
@@ -9164,7 +8954,5 @@
 "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
@@ -9200,5 +8988,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "ファイルを選ぶためにファイル選択を起動してください"
@@ -9215,7 +9003,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
@@ -9229,6 +9017,5 @@
 "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
@@ -9253,6 +9040,5 @@
 #, 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
@@ -9288,6 +9074,5 @@
 "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
@@ -9302,10 +9087,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
@@ -9317,6 +9102,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,7 +9164,5 @@
 "<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
@@ -9543,5 +9326,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9549,7 +9332,5 @@
 "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
@@ -9559,6 +9340,5 @@
 #: ../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
@@ -9568,9 +9348,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>されます"
 
@@ -9589,6 +9369,5 @@
 "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
@@ -9601,6 +9380,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
@@ -9610,6 +9389,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
@@ -9629,9 +9408,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
@@ -9672,7 +9451,6 @@
 "on the server ''{1}''."
 msgstr ""
-"サーバから現在の変更セットが閉じられたという通知がありました。<br>おそらく変"
-"更セットのサイズがサーバ {1} 上の {0} オブジェクトの最大サイズを超えていま"
-"す。"
+"サーバから現在の変更セットが閉じられたという通知がありました。<br>おそらく変更セットのサイズがサーバ {1} 上の {0} "
+"オブジェクトの最大サイズを超えています。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -9686,12 +9464,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
@@ -9700,5 +9477,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9706,14 +9483,10 @@
 "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
@@ -9726,5 +9499,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}"
 
@@ -9733,7 +9507,5 @@
 "<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
@@ -9741,7 +9513,5 @@
 "<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
@@ -9769,7 +9539,5 @@
 #: ../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
@@ -9783,6 +9551,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
@@ -9796,7 +9564,5 @@
 #: ../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
@@ -9806,6 +9572,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
@@ -9815,6 +9581,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
@@ -9844,6 +9610,5 @@
 #, 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
@@ -9953,10 +9718,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
@@ -9981,10 +9746,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:373
@@ -10044,10 +9809,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -10060,5 +9824,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10110,7 +9874,5 @@
 "<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:1126
@@ -10122,7 +9884,5 @@
 "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:1293
@@ -10130,7 +9890,5 @@
 "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
@@ -10178,7 +9936,5 @@
 "{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
@@ -10227,10 +9983,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
@@ -10284,11 +10039,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
@@ -10354,87 +10108,90 @@
 msgstr "自動推測"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "手動調整"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "次の位置を上書きする "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "EXIFデータ中に位置情報を含む画像 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "タグ付け済みの画像 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "地図にサムネイル画像を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "タイムゾーン: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "オフセット:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "GPXトラックに画像を関連づけます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "関連付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "不正なタイムゾーン"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "不正なオフセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "再試行"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "イメージがマッチしません!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "gpx が選択されていません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
 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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+msgstr[0] "<html>写真は<b>{1}</b> 件中<b>{0}</b> 件がGPSトラックに一致しました。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "タイムゾーン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10442,49 +10199,45 @@
 msgstr[0] "{0} 日の時差"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
-msgstr ""
-"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照"
-"合できます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+msgstr "GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照合できます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "選択した写真には時間情報がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "写真は時間情報を含んでいません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr ""
-"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択"
-"してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+msgstr "選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPXトラックは、時間情報を持っていません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "GPXトラックを選択しなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "GPXトラックの選択がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10495,5 +10248,5 @@
 "期待する形式: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10546,14 +10299,14 @@
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10561,5 +10314,5 @@
 msgstr[0] "{0} の画像がロードされました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10567,19 +10320,17 @@
 msgstr[0] "GPSタグが必要なものが {0}見つかりました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "ディスクから画像ファイルを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+msgstr "<html><h3> ファイル {0} をディスクから削除しますか？<p>イメージファイルは永久に失われます。</h3></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "画像ファイルが削除できません。"
@@ -10703,7 +10454,5 @@
 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
@@ -10744,7 +10493,5 @@
 "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
@@ -10752,7 +10499,5 @@
 "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
@@ -10790,6 +10535,5 @@
 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
@@ -10814,6 +10558,5 @@
 "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
@@ -10854,7 +10597,5 @@
 "<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
@@ -10878,6 +10619,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 ""
 
@@ -10895,19 +10636,15 @@
 "<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
@@ -10928,7 +10665,7 @@
 "(HTTPS)."
 msgstr ""
-"<strong>警告:</strong>パスワードは<strong>平文で</strong>OSM webサイトに転送"
-"されます。OSMサーバが暗号化した通信方式(HTTPS)を使うまで、重要なパスワードは"
-"決して<strong>使わないでください</strong>。"
+"<strong>警告:</strong>パスワードは<strong>平文で</strong>OSM "
+"webサイトに転送されます。OSMサーバが暗号化した通信方式(HTTPS)を使うまで、重要なパスワードは決して<strong>使わないでください</str"
+"ong>。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
@@ -10952,7 +10689,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
@@ -11000,6 +10736,5 @@
 #: ../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
@@ -11013,7 +10748,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
@@ -11036,10 +10770,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 はユーザ {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
@@ -11048,6 +10781,5 @@
 "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
@@ -11077,6 +10809,5 @@
 "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
@@ -11087,7 +10818,5 @@
 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
@@ -11099,7 +10828,5 @@
 "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
@@ -11114,6 +10841,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
@@ -11153,11 +10880,10 @@
 #, 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}'' パスワード ''***'' での認証に失敗しました。"
 
@@ -11215,7 +10941,5 @@
 "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
@@ -11274,6 +10998,5 @@
 "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
@@ -11295,8 +11018,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 ""
 
@@ -11316,7 +11039,6 @@
 "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
@@ -11357,7 +11079,6 @@
 "''{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
@@ -11385,8 +11106,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 ""
 
@@ -11410,16 +11131,15 @@
 "''{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
@@ -11489,84 +11209,64 @@
 msgstr "ライブ音声トレースの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "GPXを読み込むときにオーディオではないマーカーを作成"
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "有効なタイムスタンプによる明示的なウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "トラック位置から時間推定による明示的なウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "音声ファイルの時刻修正（タイムスタンプ）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "トラック開始（有効なマーカーがないときには常に行う）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "メインメニューバーでのオーディオメニューの表示・非表示の切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
 "the audio currently playing was recorded."
-msgstr ""
-"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
-"を動かして表示する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgstr "現在再生されているオーディオが記録された場所と同期して、その点を示すアイコンを動かして表示する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
-msgstr ""
-"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
-"ベルを付与する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成す"
-"る。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgstr "ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラベルを付与する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "オーディオをインポート時、次からマーカーを作成..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "オーディオをインポートする際に、GPXレイヤーのウェイポイントとして扱う"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
 "waypoints) with names or descriptions."
-msgstr ""
-"（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマー"
-"カーを作成し、名前と説明を付加する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgstr "（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマーカーを作成し、名前と説明を付加する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
-msgstr ""
-"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
-"ラックの位置にオーディオマーカーを作成してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgstr "インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したトラックの位置にオーディオマーカーを作成してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11574,33 +11274,31 @@
 msgstr "対応するボタンを押したときに何秒分進む・戻るのか。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "時刻を進める/戻す(秒)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "早回しの時に何倍速にするのか。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "高速再生の倍率"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
 "audio track position requested"
-msgstr ""
-"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
-"ら開始する。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgstr "再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置から開始する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Lead-in 時間(秒)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "音声録音の残り時間と実際の残り時間の割合"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "ボイスレコーダの調整"
@@ -11640,5 +11338,5 @@
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11649,34 +11347,34 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "HDOP（垂直精度劣化度）の値の円を描いてください"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率（赤=高い、緑=低い、可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -11684,5 +11382,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11704,5 +11402,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11744,5 +11442,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11756,50 +11454,60 @@
 msgstr "徒歩"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "ウェイの向きを矢印で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "一方通行など、必要なときのみ向きを表示"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "アクティブなレイヤー以外は別の色で表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチエイリアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成する。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "GPSトラックのポイント間の線"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11807,34 +11515,35 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11842,25 +11551,23 @@
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
 "Layer Manager."
-msgstr ""
-"全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ"
-"可能です。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+msgstr "全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ可能です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11868,46 +11575,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -11979,5 +11687,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12026,6 +11735,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "プラグインを更新"
@@ -12043,7 +11752,5 @@
 "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
@@ -12098,6 +11805,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
@@ -12106,6 +11813,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 ""
 
@@ -12118,9 +11825,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 ""
 
@@ -12417,9 +12124,8 @@
 #, 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:766
@@ -12482,7 +12188,5 @@
 "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:108
@@ -12510,7 +12214,5 @@
 "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
@@ -12522,7 +12224,5 @@
 "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
@@ -12536,7 +12236,5 @@
 "<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
@@ -12548,6 +12246,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 ""
 
@@ -12558,6 +12256,5 @@
 "''{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
@@ -12571,6 +12268,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 ""
 
@@ -12605,7 +12302,5 @@
 "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
@@ -12615,6 +12310,5 @@
 #: ../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
@@ -12651,5 +12345,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr "警告: 認証証明マネージャからのOAuthトークン参照に失敗。"
 
@@ -12662,13 +12357,10 @@
 "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
@@ -12692,7 +12384,5 @@
 #: ../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
@@ -12747,7 +12437,5 @@
 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
@@ -12765,9 +12453,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
@@ -12783,7 +12471,5 @@
 "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
@@ -12855,9 +12541,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 msgid "Preset role element without parent"
-msgstr ""
+msgstr "親の無いロール要素をプリセット"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:748
 msgid "Preset sub element without parent"
-msgstr ""
+msgstr "親の無いサブ要素をプリセット"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
@@ -12932,14 +12618,10 @@
 "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
@@ -12979,6 +12661,5 @@
 "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
@@ -13013,13 +12694,10 @@
 "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
@@ -13052,7 +12730,5 @@
 "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
@@ -13061,7 +12737,5 @@
 "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
@@ -13070,17 +12744,14 @@
 "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
@@ -13128,7 +12799,5 @@
 "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
@@ -13205,7 +12874,5 @@
 "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
@@ -13262,8 +12929,7 @@
 #: ../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
@@ -13315,7 +12981,5 @@
 "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
@@ -13372,7 +13036,5 @@
 "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
@@ -13391,7 +13053,5 @@
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
-msgstr ""
-"変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: "
-"''{1}''"
+msgstr "変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
@@ -13462,7 +13122,5 @@
 #, 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
@@ -13558,6 +13216,5 @@
 "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
@@ -13566,7 +13223,5 @@
 "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
@@ -13575,6 +13230,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
-"データの形式に誤りがあります。ノード、ウェイ、リレーションの何れかが "
-"\"cretate\"、\"modify\"、\"delete\" ではない箇所に記述されています。"
+"データの形式に誤りがあります。ノード、ウェイ、リレーションの何れかが \"cretate\"、\"modify\"、\"delete\" "
+"ではない箇所に記述されています。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13583,7 +13238,5 @@
 "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
@@ -13627,6 +13280,5 @@
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
-"入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
+msgstr "入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:218
@@ -13662,9 +13314,7 @@
 #, 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
@@ -13691,9 +13341,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
@@ -13723,6 +13373,5 @@
 #: ../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
@@ -13735,5 +13384,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
 
@@ -13749,6 +13399,5 @@
 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
@@ -13801,7 +13450,5 @@
 "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
@@ -13827,7 +13474,5 @@
 "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
@@ -13857,6 +13502,5 @@
 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
@@ -13880,7 +13524,5 @@
 "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
@@ -14012,6 +13654,5 @@
 #, 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
@@ -14064,7 +13705,5 @@
 "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
@@ -14074,6 +13713,5 @@
 "valid URL. Skipping download."
 msgstr ""
-"警告: プラグイン\"{0}\"をダウンロードできません。ダウンロードリンク\"{1}"
-"\"は、不正なURLです。ダウンロードスキップします。"
+"警告: プラグイン\"{0}\"をダウンロードできません。ダウンロードリンク\"{1}\"は、不正なURLです。ダウンロードスキップします。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
@@ -14106,7 +13744,6 @@
 "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
@@ -14115,6 +13752,5 @@
 "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
@@ -14139,7 +13775,5 @@
 "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
@@ -14147,7 +13781,5 @@
 "Skipping plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr ""
-"更新間隔が過ぎた後のプラグイン更新をスキップします。開始時の自動更新を停止し"
-"ます。"
+msgstr "更新間隔が過ぎた後のプラグイン更新をスキップします。開始時の自動更新を停止します。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
@@ -14155,7 +13787,5 @@
 "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
@@ -14163,6 +13793,5 @@
 "Running plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr ""
-"更新間隔が過ぎた後のプラグイン更新を行います。開始時の自動更新は停止します。"
+msgstr "更新間隔が過ぎた後のプラグイン更新を行います。開始時の自動更新は停止します。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
@@ -14170,6 +13799,5 @@
 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
@@ -14186,17 +13814,21 @@
 #, 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>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+"<html>プラグイン {0} には JOSM バージョン {1} が必要です。現在の JOSM バージョンは {2} "
+"です。<br>このプラグインを使うにはJOSMを更新しなければなりません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "プラグイン {0} を読み込めません。設定から削除しますか？"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "プラグイン ''{0}'' をロード中 (バージョン {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14207,50 +13839,45 @@
 "が見つかりません。<br>プリファレンスから削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "プラグイン {0} を読み込めません。設定から削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "プラグインの読み込み"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "プラグインの前提条件をチェック中.."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "プラグイン \"{0}\"の読み込み..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
 msgstr[0] "JOSMは次のプラグインの情報を見つけられません:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
 msgstr[0] "プラグインはロードされません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "ロードすべきプラグインを確認しています..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "古くなったプラグインを削除しています..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "維持されていないプラグインを取り外します..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
 msgstr[0] "次のプラグインの更新に失敗:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14259,45 +13886,44 @@
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
-msgstr[0] ""
-"JOSMが開始してからプリファレンスダイアログを開いて手動更新してみてください。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+msgstr[0] "JOSMが開始してからプリファレンスダイアログを開いて手動更新してみてください。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "プラグインの更新に失敗しました"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "警告: プラグイン情報リストのダウンロードに失敗"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "プラグイン \"{0}\"の削除をするにはクリック"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "クリックしてプラグイン ''{0}'' を保持"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "警告: 期限切れプラグイン ''{0}'' の削除に失敗。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14305,22 +13931,20 @@
 "installation. JOSM is still going to load the old plugin version."
 msgstr ""
-"警告: ダウンロード済みのプラグイン ''{0}'' のインストールに失敗。インストール"
-"をスキップします。JOSMは古いプラグインのバージョンをロードします。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+"警告: ダウンロード済みのプラグイン ''{0}'' "
+"のインストールに失敗。インストールをスキップします。JOSMは古いプラグインのバージョンをロードします。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
 "Warning: failed to install plugin ''{0}'' from temporary download file "
 "''{1}''. Renaming failed."
-msgstr ""
-"警告: 一時ダウンロードファイル ''{1}'' からのプラグイン ''{0}'' のインストー"
-"ルに失敗。リネームに失敗。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+msgstr "警告: 一時ダウンロードファイル ''{1}'' からのプラグイン ''{0}'' のインストールに失敗。リネームに失敗。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "クリックしてプラグイン ''{0}'' を無効化"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14328,44 +13952,38 @@
 msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
-msgstr ""
-"バグレポートをする前に、最新バージョンのプラグインにアップデートしてくださ"
-"い。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+msgstr "バグレポートをする前に、最新バージョンのプラグインにアップデートしてください。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
 "unload the plugin."
-msgstr ""
-"プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを"
-"再起動してください。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+msgstr "プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを再起動してください。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "プラグイン情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "説明がありません"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
 "change it later)"
-msgstr ""
-"この決定を記憶し、次回からは確認しない (プリファレンス>プラグイン で後から変"
-"更できます)"
+msgstr "この決定を記憶し、次回からは確認しない (プリファレンス>プラグイン で後から変更できます)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:81
@@ -14402,8 +14020,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, 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:106
@@ -14427,6 +14044,5 @@
 "from plugin site ''{1}''."
 msgstr ""
-"警告: プラグインディレクトリ ''{0}'' の作成に失敗。プラグインサイト ''{1}'' "
-"からのプラグインリストをキャッシュできません。"
+"警告: プラグインディレクトリ ''{0}'' の作成に失敗。プラグインサイト ''{1}'' からのプラグインリストをキャッシュできません。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:192
@@ -14446,7 +14062,5 @@
 "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:265
@@ -14461,5 +14075,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
 msgid "unspecified reason"
-msgstr ""
+msgstr "不明な理由"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:348
@@ -14468,5 +14082,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"
@@ -14483,6 +14097,6 @@
 "file a bug report."
 msgstr ""
-"予期せぬ例外が発生。<br>これはたいていコーディングエラーです。最新の<br>JOSM"
-"を実行している場合は、おおらかな気持ちでバグレポートをファイルしてください。"
+"予期せぬ例外が発生。<br>これはたいていコーディングエラーです。最新の<br>JOSMを実行している場合は、おおらかな気持ちでバグレポートをファイルして"
+"ください。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
@@ -14494,7 +14108,5 @@
 "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
@@ -14502,7 +14114,5 @@
 "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
@@ -14511,7 +14121,5 @@
 "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
@@ -14519,6 +14127,5 @@
 "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
@@ -14536,6 +14143,5 @@
 "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
@@ -14555,7 +14161,6 @@
 "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
@@ -14563,37 +14168,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 ""
 
@@ -14603,7 +14208,5 @@
 "<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
@@ -14615,7 +14218,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 ""
 
@@ -14625,7 +14228,5 @@
 "<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
@@ -14635,6 +14236,5 @@
 "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
@@ -14643,7 +14243,5 @@
 "<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
@@ -14657,6 +14255,5 @@
 "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
@@ -14667,7 +14264,6 @@
 "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
@@ -14676,7 +14272,5 @@
 "<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
@@ -14686,6 +14280,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
@@ -14695,15 +14289,17 @@
 "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
@@ -14714,11 +14310,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
@@ -14743,7 +14338,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
@@ -14752,13 +14346,13 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+"<html>サーバからオブジェクト削除の報告がありました。<br>このオブジェクトを更新または削除しようとしたのであれば<strong>アップロードは失敗"
+"</strong>です。<br> "
+"このオブジェクトをダウンロードしようとしたのであれば<strong>ダウンロードは失敗</strong>です。<br><br>エラーメッセージ:<br>{"
+"0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14776,7 +14370,5 @@
 "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
@@ -14785,7 +14377,5 @@
 "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
@@ -14794,7 +14384,5 @@
 "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
@@ -14802,7 +14390,5 @@
 "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!
@@ -14826,6 +14412,5 @@
 "\n"
 msgstr ""
-"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられて"
-"いるために\n"
+"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられているために\n"
 "アクション\"{1}\"({2})への割り当てに失敗しました。\n"
 "\n"
@@ -14865,6 +14450,5 @@
 "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
@@ -14873,7 +14457,5 @@
 "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
@@ -14883,6 +14465,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
@@ -14892,6 +14474,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
@@ -14900,7 +14482,5 @@
 "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
@@ -14942,7 +14522,5 @@
 "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
@@ -15261,9 +14839,9 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
-msgstr ""
+msgstr "描画を始める建物の角度をポイント"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
-msgstr ""
+msgstr "建物の反対側の終端をポイント"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
@@ -15419,7 +14997,5 @@
 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
@@ -15454,7 +15030,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15464,5 +15040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15472,5 +15048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15486,5 +15062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15494,5 +15070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15523,5 +15099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15530,5 +15106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15537,5 +15113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15544,5 +15120,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15551,5 +15127,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15558,5 +15134,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15590,16 +15166,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"フランス 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>"
+"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>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -15626,6 +15204,5 @@
 "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
@@ -15791,6 +15368,5 @@
 #: ../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
@@ -15952,6 +15528,5 @@
 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
@@ -15959,14 +15534,10 @@
 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
@@ -15995,6 +15566,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
@@ -16083,7 +15654,5 @@
 "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
@@ -16094,6 +15663,5 @@
 #, 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
@@ -16101,34 +15669,35 @@
 msgstr "ランベルトゾーンキャッシュエラー"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "使う"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "使用するスキームを選択してください。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "配色"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "削除する配色を選択してください。"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "選択した配色を一覧から使用する。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "現在の色を、新しい配色として使用します。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "選択した配色を一覧から削除する。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "配色"
@@ -16203,5 +15772,5 @@
 msgstr "GPSトラックを編集するためのレイヤーです。"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "匿名時間も含めたGPXレイヤーへのコンバート"
@@ -16292,4 +15861,5 @@
 msgstr "ポート:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16354,7 +15924,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
@@ -16365,6 +15935,5 @@
 #: ../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
@@ -16503,5 +16072,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16622,5 +16191,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr "各生成されたウェイで許されるセグメントの最大数。既定値は250"
 
@@ -16629,7 +16199,5 @@
 "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
@@ -16637,15 +16205,12 @@
 "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
@@ -16928,7 +16493,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
@@ -16941,6 +16505,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
@@ -16955,8 +16519,7 @@
 
 #: ../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
@@ -16981,7 +16544,5 @@
 "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
@@ -17027,7 +16588,5 @@
 "<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
@@ -17069,5 +16628,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr "あなたのキューには保存されていない変更があります。今すぐ登録しますか？"
 
@@ -17103,7 +16663,5 @@
 "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
@@ -17120,5 +16678,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr "次のファイルのexif ヘッダに位置情報を書き込む:"
 
@@ -17171,6 +16730,5 @@
 #: ../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
@@ -17427,6 +16985,6 @@
 "talking to the plugin."
 msgstr ""
-"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと"
-"会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。"
+"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと会話をするほかのアプリケーションが参照するので、ポート番号は変更"
+"できません。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
@@ -17436,7 +16994,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 ""
-"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要"
-"求されました。"
+msgstr "APIを通じて、リモートコントロールプラグインによって、データをロードするよう要求されました。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
@@ -17463,7 +17019,5 @@
 #: ../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:30
@@ -17483,5 +17037,5 @@
 #: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
 msgid "Preparing history data..."
-msgstr ""
+msgstr "履歴データを準備中..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
@@ -17813,6 +17367,5 @@
 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
@@ -17822,5 +17375,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:66
 msgid "Enter housenumbers or amount of segments"
-msgstr ""
+msgstr "家番号またはセグメントの量を入力"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:93
@@ -17940,4 +17493,12 @@
 msgid "Terrace"
 msgstr "テラスハウス"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -18122,7 +17683,5 @@
 "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
@@ -18154,6 +17713,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
@@ -18163,6 +17722,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
@@ -18351,4 +17910,6 @@
 "data set.</html>"
 msgstr ""
+"<html>選択して現在のセクションのオブジェクトに関連する方向転換制限だけを表示。<br>選択解除して現在のデータセット中の全ての方向転換制限を表示。<"
+"/html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:162
@@ -18387,7 +17948,8 @@
 #: ../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 ""
+"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
@@ -18472,8 +18034,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 ""
 
@@ -18502,5 +18064,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80
 msgid "Fix in editor"
-msgstr ""
+msgstr "エディタで修正"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58
@@ -18527,8 +18089,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 ""
 
@@ -18551,6 +18113,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
@@ -18641,6 +18202,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 ""
 
@@ -18648,6 +18209,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 ""
 
@@ -18670,5 +18231,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
 msgid "Undelete object by id"
-msgstr ""
+msgstr "ＩＤでオブジェクトの削除を取り消し"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -18682,5 +18243,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
 msgid "Undelete Object"
-msgstr ""
+msgstr "オブジェクトの削除を取り消し"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
@@ -18771,7 +18332,5 @@
 "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
@@ -18929,7 +18488,5 @@
 "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
@@ -19051,7 +18608,5 @@
 "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
@@ -19289,9 +18844,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"スペルチェックのソース(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:744
@@ -19437,5 +18994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19455,7 +19012,5 @@
 #: ../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
@@ -19482,6 +19037,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 ""
-"このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
+msgstr "このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
@@ -19491,6 +19045,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 ""
-"このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
+msgstr "このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
@@ -19539,5 +19092,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19591,18 +19144,15 @@
 "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
@@ -19622,9 +19172,7 @@
 "continue way downloading?</html>"
 msgstr ""
-"<html>これ以上、ダウンロードすべき接続されたウエイがありません。<br>しかし、"
-"現在選択されているノードと重複していそうなものが見つかりました。<br><br>現在"
-"選択されているノードは、\"{0}\"です。<br>重複していそうなノードは\"{1}\"で"
-"す。<br>重複したノードを現在選択したノードに混合してウエイのダウンロードを継"
-"続しますか？</html>"
+"<html>これ以上、ダウンロードすべき接続されたウエイがありません。<br>しかし、現在選択されているノードと重複していそうなものが見つかりました。<b"
+"r><br>現在選択されているノードは、\"{0}\"です。<br>重複していそうなノードは\"{1}\"です。<br>重複したノードを現在選択したノード"
+"に混合してウエイのダウンロードを継続しますか？</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -19701,7 +19249,5 @@
 "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
@@ -19743,7 +19289,5 @@
 "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
@@ -19799,6 +19343,6 @@
 msgstr ""
 "<html>このWMS レイヤー用のベースURL<br>''{0}''<br>の終わりに ''&'' や ''?'' "
-"を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合があります。"
-"設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
+"を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合があります。設定を<br>チェックしてください。<br>強制的にWMS "
+"タイルを取得しますか？"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
@@ -19817,6 +19361,5 @@
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
+msgstr "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
@@ -19932,52 +19475,45 @@
 msgstr "WMS ファイル (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
 "area, or use planet.osm"
 msgstr ""
-"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリア"
-"で要求し直すか、planet.osmを使用してください。"
+"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリアで要求し直すか、planet.osmを使用してください。"
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "データベースはメンテナンスのためにオフラインになっています。"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
 "request a smaller area, or use planet.osm"
-msgstr ""
-"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す"
-"るか、planet.osm を使用して下さい。"
-
-#. OSM server message
-#: build/specialmessages.java:9
+msgstr "bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求するか、planet.osm を使用して下さい。"
+
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "入力したURLからは音声入力ストリームを取得できません"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "オーディオ装置は使えません"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
-msgstr ""
-"新しいデータをアップロードするには編集をパブリックにしなければなりません"
-
-#. use has not made edits public
-#: build/specialmessages.java:12
+msgstr "新しいデータをアップロードするには編集をパブリックにしなければなりません"
+
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19985,17 +19521,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "森"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20003,7 +19539,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20013,5 +19549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20054,5 +19590,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20062,5 +19598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20070,5 +19606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20078,8 +19614,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20093,5 +19629,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20102,5 +19638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20109,7 +19645,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20119,5 +19655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20127,5 +19663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20135,5 +19671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20143,5 +19679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20151,5 +19687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20159,5 +19695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20167,8 +19703,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20178,59 +19714,60 @@
 msgstr "ルート"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "オプションの属性："
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "修飾キー:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "ファイル名"
-
+msgstr "ファイル名:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "踏み越し段"
-
+msgstr "サイズ"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "燃料の種類:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "ホームページ"
-
+msgstr "ホーム"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "道教"
-
+msgstr "リスト"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "ズームイン"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "新しいロール"
-
+msgstr "新しいフォルダ"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "新規ノードの作成"
-
+msgstr "新しいフォルダを作成"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "保存"
-
+msgstr "保存先:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20263,8 +19800,6 @@
 "true :-)"
 msgstr ""
-"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい"
-"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の"
-"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map "
-"Settings'' を参照してください(奇妙ですが本当です :-)"
+"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しいスキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の白"
+"い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map Settings'' を参照してください(奇妙ですが本当です :-)"
 
 #. Plugin Create_grid_of_ways
@@ -20277,12 +19812,10 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
-"チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
+msgstr "チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
 
 #. Plugin dataimport
 #: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
-"様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
+msgstr "様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
 
 #. Plugin DirectUpload
@@ -20291,7 +19824,5 @@
 "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
@@ -20305,11 +19836,10 @@
 "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:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
@@ -20331,7 +19861,6 @@
 "the filename of an image."
 msgstr ""
-"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ"
-"イントタグの ''name'', ''cmt'' または ''desc'' 属性が画像のファイル名と一致し"
-"たときに行われます。"
+"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポイントタグの ''name'', ''cmt'' または "
+"''desc'' 属性が画像のファイル名と一致したときに行われます。"
 
 #. Plugin lakewalker
@@ -20352,7 +19881,5 @@
 "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
@@ -20371,7 +19898,5 @@
 "Create multipolygons by one click, much easier than standard way with "
 "relation editor."
-msgstr ""
-"マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方"
-"よりはるかに簡単です。"
+msgstr "マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方よりはるかに簡単です。"
 
 #. Plugin nearclick
@@ -20382,7 +19907,6 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
-"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用して"
-"いて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちま"
-"す。（一般的な Java - タブレット問題）"
+"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用していて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちます。"
+"（一般的な Java - タブレット問題）"
 
 #. Plugin openlayers
@@ -20394,7 +19918,5 @@
 #: build/trans_plugins.java:47
 msgid "Imports issues from OpenStreetBugs"
-msgstr ""
-"OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにしま"
-"す。"
+msgstr "OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにします。"
 
 #. Plugin openvisible
@@ -20408,7 +19930,5 @@
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr ""
-"現在表示されているスクリーンを、きれいなSVG画像として表示されるように、"
-"Firefoxを起動する。"
+msgstr "現在表示されているスクリーンを、きれいなSVG画像として表示されるように、Firefoxを起動する。"
 
 #. Plugin photo_geotagging
@@ -20417,7 +19937,5 @@
 "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
@@ -20426,7 +19944,5 @@
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
-msgstr ""
-"このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることが"
-"できます。"
+msgstr "このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることができます。"
 
 #. Plugin plastic_laf
@@ -20449,5 +19965,5 @@
 #: build/trans_plugins.java:63
 msgid "Plugin for reverting changesets"
-msgstr ""
+msgstr "変更セットを元に戻すプラグイン"
 
 #. Plugin routes
@@ -20457,7 +19973,6 @@
 "defined in routes.xml file in plugin directory"
 msgstr ""
-"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートの"
-"タイプはplugin ディレクトリのroute.xml ファイルに定義されていなければなりませ"
-"ん"
+"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートのタイプはplugin ディレクトリのroute.xml "
+"ファイルに定義されていなければなりません"
 
 #. Plugin routing
@@ -20471,7 +19986,5 @@
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
 "background and request updates."
-msgstr ""
-"JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景として"
-"ロードし、更新を要求できます。"
+msgstr "JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景としてロードし、更新を要求できます。"
 
 #. Plugin surveyor
@@ -20492,7 +20005,6 @@
 "the jar-file as standalone as well."
 msgstr ""
-"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリ"
-"セットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar "
-"ファイルも同様にスタンドアロンとして起動できます。"
+"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリセットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar"
+" ファイルも同様にスタンドアロンとして起動できます。"
 
 #. Plugin terracer
@@ -20501,6 +20013,13 @@
 msgstr "1つのブロックからテラスハウスを作成する"
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20509,5 +20028,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20516,19 +20035,17 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
-msgstr ""
+msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
-msgstr ""
-"OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供しま"
-"す。タグ名用にスペルチェック機能が統合されています。"
+msgstr "OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供します。タグ名用にスペルチェック機能が統合されています。"
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20538,24 +20055,24 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 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:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20564,5 +20081,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21452,7 +20969,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21592,8 +21109,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"/>
@@ -21803,5 +21320,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21811,5 +21328,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21828,5 +21345,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21836,5 +21353,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21853,5 +21370,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21861,5 +21378,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21878,5 +21395,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21886,5 +21403,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21899,5 +21416,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21915,5 +21432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21931,5 +21448,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21938,5 +21455,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21946,5 +21463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21964,5 +21481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21971,5 +21488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21979,5 +21496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22683,5 +22200,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22732,5 +22249,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22827,5 +22344,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22994,5 +22511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23326,5 +22843,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23334,5 +22851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23342,5 +22859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23350,5 +22867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23358,5 +22875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23366,5 +22883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23374,5 +22891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23383,5 +22900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24801,5 +24318,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24809,5 +24326,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24817,5 +24334,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24825,5 +24342,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25187,7 +24704,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25197,5 +24714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25205,5 +24722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25213,5 +24730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25221,5 +24738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25229,5 +24746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25237,5 +24754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25245,5 +24762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25253,5 +24770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25261,5 +24778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25269,5 +24786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25277,5 +24794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25285,5 +24802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25293,5 +24810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25301,5 +24818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25309,5 +24826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25317,5 +24834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25325,5 +24842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25333,5 +24850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25341,5 +24858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25349,5 +24866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25357,5 +24874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25365,5 +24882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25373,5 +24890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25381,5 +24898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25389,5 +24906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25397,5 +24914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25405,5 +24922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25413,5 +24930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25421,5 +24938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25429,5 +24946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25437,5 +24954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25445,5 +24962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25453,5 +24970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25461,5 +24978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25469,5 +24986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25477,5 +24994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25485,5 +25002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25493,5 +25010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25501,5 +25018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25509,5 +25026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25517,5 +25034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25525,5 +25042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25533,5 +25050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25541,5 +25058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25549,5 +25066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25557,5 +25074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27262,7 +26779,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27272,5 +26789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27280,5 +26797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27288,5 +26805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27296,5 +26813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27304,5 +26821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27312,5 +26829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27320,5 +26837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27328,5 +26845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28749,5 +28266,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28763,5 +28280,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28771,5 +28288,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28780,5 +28297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28791,7 +28308,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28801,5 +28318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28809,5 +28326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28817,5 +28334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28825,5 +28342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28857,5 +28374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28871,5 +28388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28879,5 +28396,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28886,5 +28403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28894,5 +28411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28903,5 +28420,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28926,5 +28443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29039,9 +28556,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
@@ -29049,5 +28566,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,
@@ -29057,8 +28574,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
@@ -29072,5 +28589,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29078,5 +28595,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29125,6 +28642,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>
@@ -29204,5 +28721,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29212,11 +28729,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29232,5 +28749,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29239,5 +28756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29246,5 +28763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29260,5 +28777,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29272,5 +28789,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29279,5 +28796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29286,5 +28803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29293,5 +28810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29300,5 +28817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29307,5 +28824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29314,5 +28831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29321,5 +28838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29328,5 +28845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29335,5 +28852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29342,5 +28859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29349,5 +28866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29356,5 +28873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29363,5 +28880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29370,5 +28887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29545,7 +29062,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29559,5 +29076,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29567,7 +29084,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29577,5 +29094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29585,5 +29102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29593,5 +29110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29601,5 +29118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29615,5 +29132,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29622,5 +29139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29630,5 +29147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29637,5 +29154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29644,5 +29161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29651,5 +29168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29658,5 +29175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29665,5 +29182,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29672,5 +29189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29679,5 +29196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29686,5 +29203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29693,5 +29210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29705,5 +29222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29717,5 +29234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29724,5 +29241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29736,5 +29253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29749,5 +29266,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29762,5 +29279,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29774,5 +29291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29786,5 +29303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29793,5 +29310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29800,5 +29317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29808,5 +29325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29815,5 +29332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29822,5 +29339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29829,5 +29346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29837,5 +29354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29846,5 +29363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29854,7 +29371,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29864,5 +29381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29872,5 +29389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29880,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29889,5 +29406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29896,5 +29413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29904,5 +29421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29912,5 +29429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29920,5 +29437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29928,5 +29445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29936,5 +29453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29944,5 +29461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29952,5 +29469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29960,5 +29477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29968,5 +29485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29989,5 +29506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30002,7 +29519,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30012,5 +29529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30019,5 +29536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30027,5 +29544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30034,5 +29551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30042,5 +29559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30050,5 +29567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30064,5 +29581,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30073,5 +29590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30090,5 +29607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30098,5 +29615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30109,5 +29626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30126,5 +29643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30133,5 +29650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30140,5 +29657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30147,7 +29664,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30158,5 +29675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30171,5 +29688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30183,5 +29700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30191,5 +29708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30203,5 +29720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30215,5 +29732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30222,5 +29739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30229,7 +29746,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30239,5 +29756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30247,5 +29764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30255,5 +29772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30263,5 +29780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30271,5 +29788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30285,7 +29802,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30300,5 +29817,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30313,5 +29830,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30326,5 +29843,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30339,5 +29856,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30352,5 +29869,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30365,7 +29882,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30375,5 +29892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30382,5 +29899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30390,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30398,5 +29915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30406,5 +29923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30414,5 +29931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30422,5 +29939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30430,5 +29947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30438,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30446,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30454,5 +29971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30462,5 +29979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30470,5 +29987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30488,5 +30005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30501,5 +30018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30512,7 +30029,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30522,5 +30039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30530,5 +30047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30538,5 +30055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30546,5 +30063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30554,5 +30071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30562,5 +30079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30570,5 +30087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30578,5 +30095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30586,5 +30103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30594,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30602,5 +30119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30610,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30618,5 +30135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30626,5 +30143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30634,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30642,5 +30159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30662,5 +30179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30674,7 +30191,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30684,5 +30201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30692,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30700,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30708,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30716,5 +30233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30724,5 +30241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30732,5 +30249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30740,5 +30257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30748,5 +30265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30756,5 +30273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30773,5 +30290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30781,5 +30298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30789,5 +30306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30797,5 +30314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30805,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30813,5 +30330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30821,5 +30338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30829,5 +30346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30837,5 +30354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30845,5 +30362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30853,5 +30370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30861,5 +30378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30878,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30885,5 +30402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30893,5 +30410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30900,5 +30417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30908,5 +30425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30916,5 +30433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30924,5 +30441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30931,5 +30448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30939,5 +30456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30947,5 +30464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30955,5 +30472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30963,5 +30480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30970,5 +30487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30977,5 +30494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30984,5 +30501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30991,5 +30508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30998,5 +30515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31005,5 +30522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31012,5 +30529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31019,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31026,5 +30543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31033,5 +30550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31040,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31047,5 +30564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31054,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31062,5 +30579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31070,5 +30587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31078,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31086,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31094,5 +30611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31102,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31110,5 +30627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31118,5 +30635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31126,5 +30643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31135,5 +30652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31143,5 +30660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31151,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31159,5 +30676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31167,5 +30684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31175,5 +30692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31183,5 +30700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31191,5 +30708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31199,5 +30716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31207,5 +30724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31215,5 +30732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31223,5 +30740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31231,5 +30748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31239,5 +30756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31247,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31255,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31263,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31271,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31279,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31287,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31294,5 +30811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31324,5 +30841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31332,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31340,7 +30857,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31355,5 +30872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31363,5 +30880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31371,5 +30888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31379,5 +30896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31387,5 +30904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31395,5 +30912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31403,5 +30920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31417,7 +30934,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31427,5 +30944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31435,5 +30952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31443,5 +30960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31451,5 +30968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31459,5 +30976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31467,5 +30984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31475,5 +30992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31483,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31491,5 +31008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31499,5 +31016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31507,5 +31024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31515,5 +31032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31523,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31531,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31539,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31547,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31555,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31563,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31571,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31579,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31587,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31595,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31603,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31611,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31619,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31627,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31635,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31643,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31651,5 +31168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31659,5 +31176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31667,5 +31184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31675,5 +31192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31683,5 +31200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31691,5 +31208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31699,5 +31216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31707,5 +31224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31715,5 +31232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31723,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31731,5 +31248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31739,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31747,5 +31264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31755,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31789,7 +31306,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31799,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31807,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31815,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31823,5 +31340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31831,5 +31348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31839,5 +31356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31847,5 +31364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31862,5 +31379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31870,5 +31387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31878,5 +31395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31886,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31894,5 +31411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31902,5 +31419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31911,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31919,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31927,5 +31444,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31935,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31942,5 +31459,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31949,5 +31466,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31965,7 +31482,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31975,5 +31492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31983,5 +31500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31991,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31999,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32007,5 +31524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32015,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32023,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32031,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32039,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32055,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32067,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32079,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32087,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32099,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32111,6 +31628,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32120,5 +31637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32132,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32144,5 +31661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32156,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32168,5 +31685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32180,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32188,7 +31705,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32198,5 +31715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32206,5 +31723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32214,5 +31731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32222,5 +31739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32237,5 +31754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32248,5 +31765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32260,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32272,5 +31789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32284,5 +31801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32293,5 +31810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32301,5 +31818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32309,5 +31826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32317,5 +31834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32325,5 +31842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32340,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32352,5 +31869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32364,5 +31881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32376,5 +31893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32388,5 +31905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32401,5 +31918,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?
@@ -32425,5 +31942,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32434,11 +31951,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32448,5 +31965,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32456,5 +31973,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32464,5 +31981,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32472,5 +31989,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32480,5 +31997,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32488,5 +32005,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32496,5 +32013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32504,5 +32021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32512,5 +32029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32520,5 +32037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32528,5 +32045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32536,5 +32053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32554,5 +32071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32647,5 +32164,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32653,28 +32170,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
@@ -32789,5 +32306,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32800,5 +32317,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>
@@ -32823,6 +32340,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32831,6 +32348,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32845,6 +32362,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
@@ -32858,6 +32375,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
@@ -32877,6 +32394,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32900,6 +32417,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
@@ -32984,4 +32501,5 @@
 #~ msgstr "JOSMオンラインヘルプ"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32993,15 +32511,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を再起動してください。"
-
+#~ msgstr[0] "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。"
+
+#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。"
-
+#~ "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 "{1}からプラグイン: {0}をダウンロードできません"
@@ -33010,16 +32528,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)!"
@@ -33035,11 +32553,10 @@
 #~ "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"
@@ -33052,7 +32569,5 @@
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま"
-#~ "す。"
+#~ msgstr "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
 
 #~ msgid "Please enter a search string"
@@ -33068,4 +32583,5 @@
 #~ msgstr "ズーム"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "レイヤー：{0}"
@@ -33086,7 +32602,9 @@
 #~ msgstr "OSMサーバに接続…"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "作者: {0}"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "{0} のイメージ"
@@ -33095,7 +32613,9 @@
 #~ 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} から読み取ることができませんでした"
@@ -33104,10 +32624,13 @@
 #~ 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} 秒"
@@ -33117,4 +32640,5 @@
 #~ msgstr[0] "画像"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "トラック内に {0}"
@@ -33169,4 +32693,5 @@
 #~ msgstr "不足するプラグインをダウンロードします。"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33175,6 +32700,5 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ"
-#~ "ウンロードしますか？\n"
+#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウンロードしますか？\n"
 #~ "{0}"
 
@@ -33197,4 +32721,5 @@
 #~ msgstr "差異"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "情報ディレクトリを読み取れません: {0}"
@@ -33215,4 +32740,5 @@
 #~ msgstr "セレクションのロード"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "連絡先 {0} ..."
@@ -33344,13 +32870,13 @@
 
 #~ msgid ""
-#~ "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."
+#~ msgstr "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへと戻します。"
+
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "指示の集積: {0}"
 
+#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "ファイル \"{0}\"中の日付が取得できません。"
@@ -33374,7 +32900,9 @@
 #~ msgstr "解決したバージョン:"
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "URL: \"{0}\"から読み込むことができません"
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "URL: \"{0}\"の走査エラー"
@@ -33404,7 +32932,9 @@
 #~ msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "{0}でトラブルチケットを報告してください。"
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "内部のウェイ ''{0}''が外側にあります。"
@@ -33413,10 +32943,13 @@
 #~ 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}\"を使います"
@@ -33425,7 +32958,9 @@
 #~ 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"
@@ -33449,11 +32984,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?"
+#~ "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"
@@ -33476,26 +33010,26 @@
 
 #~ 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を入手した方に問題を報告してくださ"
-#~ "い。"
-
+#~ msgstr "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。"
+
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ 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"
@@ -33512,9 +33046,7 @@
 
 #~ 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?"
@@ -33528,6 +33060,5 @@
 
 #~ 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)"
@@ -33549,11 +33080,10 @@
 #~ "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の時刻情報がありません。"
@@ -33572,7 +33102,9 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し"
-#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
-
+#~ "タグ付けのソース(URL "
+#~ "やファイル名)が、定義ファイルに設定してあります。詳しくは、http://josm.openstreetmap.de/wiki/TaggingPreset"
+#~ "s を見てください。"
+
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33591,4 +33123,5 @@
 #~ msgstr "下に移動"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "関連の編集者:{0}"
@@ -33604,6 +33137,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33625,8 +33157,7 @@
 
 #~ 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?"
@@ -33634,24 +33165,18 @@
 
 #~ 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 ""
-#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている"
-#~ "か、ダウンロードしましたか？"
-
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ msgstr "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いているか、ダウンロードしましたか？"
+
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33662,4 +33187,5 @@
 #~ msgstr "OSMにアップロード"
 
+#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
@@ -33680,4 +33206,5 @@
 #~ msgstr "とりあえず続ける"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "最初に投影法を {0} に変えてください。"
@@ -33690,9 +33217,7 @@
 
 #~ 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"
@@ -33763,13 +33288,14 @@
 
 #~ 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 "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}秒"
@@ -33777,7 +33303,5 @@
 #~ 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)"
@@ -33790,7 +33314,9 @@
 #~ 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"
@@ -33832,40 +33358,33 @@
 #~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
 #~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた"
-#~ "ジオタグを関連づけします。"
-
+#~ msgstr "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれたジオタグを関連づけします。"
+
+#, java-format
 #~ 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'を編集することで変更できます）"
-
+#~ msgstr "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager.warntime'を編集することで変更できます）"
+
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}で"
-#~ "す。"
-
+#~ msgstr "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
+
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
-#~ msgstr ""
-#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初"
-#~ "の{0}だけです。"
-
+#~ msgstr "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初の{0}だけです。"
+
+#, java-format
 #~ 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"
@@ -33875,33 +33394,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} にアップロードし、アップロード後に変更セッ"
-#~ "トを閉じる"
-
+#~ msgstr "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セットを閉じる"
+
+#, java-format
 #~ 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} へアップロードし、さらにアップロードするた"
-#~ "めに変更セットを開いておく"
-
+#~ msgstr "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするために変更セットを開いておく"
+
+#, 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>OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。"
-#~ "<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</"
-#~ "html>"
-
+#~ "<html>OSM サーバ ''{1}'' 上の変更セット ''{0}'' "
+#~ "を閉じられませんでした。<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</html>"
+
+#, java-format
 #~ msgid "Changeset {0} is unchanged. Skipping update."
 #~ msgstr "変更セット {0} は変更されていません。更新をスキップします。"
@@ -33910,20 +33429,19 @@
 #~ 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 です。"
-
+#~ "Failed to update changeset. Either there is no current changeset or the id "
+#~ "of the current changeset is 0"
+#~ msgstr "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更セットのIDが 0 です。"
+
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
@@ -33944,14 +33462,17 @@
 #~ 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} は正しくありません！"
+
 #~ msgid "Can't search because there is no loaded data."
 #~ msgstr "データがロードされていないので検索できません。"
@@ -33963,42 +33484,40 @@
 #~ msgstr "競合が検出されました"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
-#~ "ションから削除しますか？</html>"
-
+#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレーションから削除しますか？</html>"
+
+#, java-format
 #~ 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 ""
-#~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ"
-#~ "ミティブごとにリクエストするには、無効にする。"
-
+#~ "Enable to upload all changes in one request, disable to use one request per "
+#~ "changed primitive"
+#~ 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>無視するには、<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 "
@@ -34006,6 +33525,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"
@@ -34016,19 +33535,17 @@
 
 #~ 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"
@@ -34050,16 +33567,15 @@
 #~ 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"
@@ -34069,39 +33585,40 @@
 #~ 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>"
-
+#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール "
+#~ "{2}で使用されています。<br>リレーションから削除しますか?</html>"
+
+#, java-format
 #~ 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>"
-
+#~ msgstr "<html>URL の作成に失敗しました。エンコーディング ''{0}''は<br>このシステムにはありません。</html>"
+
+#, java-format
 #~ 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>"
-
+#~ msgstr "<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してください。</html>"
+
+#, java-format
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "パラメータ''{0}'' はヌルでなければなりません"
@@ -34112,8 +33629,8 @@
 #~ "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> 左クリックしたままフレームをドロー。"
+
+#, java-format
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "必要な属性 ''{0}'' がありません"
@@ -34124,14 +33641,12 @@
 #~ "Are you really sure to continue?"
 #~ msgstr ""
-#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがありま"
-#~ "す。\n"
+#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがあります。\n"
 #~ "これはノードを誤って削除する可能性があります。\n"
 #~ "本当に続けますか？"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
 #~ msgstr[0] "選択には {0} ウェイが含まれます。本当に簡略化しますか？"
 
@@ -34145,18 +33660,16 @@
 #~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
 #~ "found."
+#~ msgstr "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が見つかりません。"
+
+#, java-format
+#~ 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>."
 #~ msgstr ""
-#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が"
-#~ "見つかりません。"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
-
-#~ msgid ""
-#~ "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"
@@ -34164,18 +33677,20 @@
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してください。"
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
-#~ "い。"
-
-#~ msgid ""
-#~ "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"
+#~ msgstr "子へも適用"
 
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr "現在の変更セットはヌルです。データをアップロードできません。"
 
+#, java-format
 #~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 #~ msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
@@ -34185,9 +33700,7 @@
 
 #~ 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>"
@@ -34197,22 +33710,23 @@
 #~ 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}'' を受け取りまし"
-#~ "た"
-
+#~ msgstr "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました"
+
+#, java-format
 #~ 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."
@@ -34222,8 +33736,7 @@
 #~ 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."
@@ -34233,19 +33746,21 @@
 #~ 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} を受け取りました"
-
+#~ msgstr "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
+
+#, 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つのキーであることが期待されていま"
-#~ "す。 {1} を受けとりました。"
-
+#~ msgstr "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 {1} を受けとりました。"
+
+#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "範囲外のインデックス。{0} を受け取りました"
@@ -34254,62 +33769,68 @@
 #~ 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}''"
-
+#~ msgstr "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
+
+#, java-format
 #~ 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 は取扱えません。差分アップロードを無視しま"
-#~ "す。"
-
+#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アップロードの使用が必須ですが、API "
+#~ "は取扱えません。差分アップロードを無視します。"
+
+#, java-format
 #~ 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の使用メモリ最大サイズを増やすオプション"
 
@@ -34317,10 +33838,11 @@
 #~ 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 "
@@ -34336,6 +33858,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"
@@ -34344,6 +33866,5 @@
 #~ "use."
 #~ msgstr ""
-#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ"
-#~ "ニューに表示されます。\n"
+#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メニューに表示されます。\n"
 #~ "\n"
 #~ "高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\n"
@@ -34356,20 +33877,17 @@
 #~ "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"
@@ -34379,4 +33897,5 @@
 #~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
 
+#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "経由ノード {0}, {1}"
@@ -34386,16 +33905,19 @@
 
 #~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr ""
-#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
-
+#~ msgstr "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
+
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
 
+#, 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} 極値ノード。"
@@ -34404,15 +33926,14 @@
 #~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード"
 
+#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: "
-#~ "''{0}''。"
-
+#~ msgstr "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: ''{0}''。"
+
+#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないか"
-#~ "らです。"
-
+#~ msgstr "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないからです。"
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "パラメータの ''{0}'' はヌルではいけません"
@@ -34436,4 +33957,5 @@
 #~ msgstr "OSMから参照をダウンロードします..."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
@@ -34442,4 +33964,5 @@
 #~ msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
 
+#, java-format
 #~ msgid "Object id > 0 expected. Got {0}"
 #~ msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
@@ -34451,4 +33974,5 @@
 #~ msgstr "外部ヘルプブラウザの起動に失敗"
 
+#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "ID > 0 が必須です。入力値 {0}"
@@ -34458,10 +33982,13 @@
 #~ 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}''"
@@ -34471,11 +33998,10 @@
 
 #~ 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}"
@@ -34484,4 +34010,5 @@
 #~ msgstr "入力された緯度/経度のノードを作成できませんでした。"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
@@ -34490,4 +34017,5 @@
 #~ msgstr "利用可能な翻訳を探しています ..."
 
+#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -34497,13 +34025,17 @@
 #~ 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}"
@@ -34512,4 +34044,5 @@
 #~ msgstr "あなたのOSMアカウントのパスワードを入力してください"
 
+#, java-format
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr "変更セット演算子の不正な値: {0}。 数値が期待されています。"
@@ -34518,32 +34051,38 @@
 #~ 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"
-
+#~ "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
 #~ 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"
+#~ msgstr "ダウンロード中にエラーが発生しました"
 
 #~ msgid "Enter a changset id"
@@ -34553,7 +34092,5 @@
 #~ "Failed to add an OAuth authentication header. There is currently no OAuth "
 #~ "Access Token configured."
-#~ msgstr ""
-#~ "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していませ"
-#~ "ん。"
+#~ msgstr "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していません。"
 
 #~ msgctxt "changeset.open"
@@ -34561,17 +34098,18 @@
 #~ msgstr "開く"
 
+#, java-format
 #~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
-
+#~ msgstr "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{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 "警告: 現在のJOSMユーザ用のユーザ情報の参照に失敗。例外コード: {0}"
 
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>ディレクトリを開けません。<br>ファイルを選択してください！</html>"
-
+#~ msgstr "<html>ディレクトリを開けません。<br>ファイルを選択してください！</html>"
+
+#, java-format
 #~ msgid "Node {0} cannot be added to the way because it was deleted"
 #~ msgstr "ノード {0} は削除済みなのでウェイに追加できません"
@@ -34594,2 +34132,6 @@
 #~ msgid "Use all their elements"
 #~ msgstr "全て相手の要素を使う"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "摂氏"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-06-01 18:59+0000\n"
 "Last-Translator: Smart Viking <smart_viking@live.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -258,6 +258,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -312,6 +312,6 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
+"to.</html>"
 msgstr ""
 
@@ -335,9 +335,9 @@
 #. Add extra shortcut C-S-a
 #. Add extra shortcut ESCAPE
-#.
+#. 
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -428,6 +428,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -641,12 +641,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1433,5 +1433,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1452,5 +1453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1601,5 +1602,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr "Vis statusrapport med informasjon for feilsøking"
 
@@ -1621,5 +1623,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1821,5 +1823,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
 
@@ -1889,9 +1892,9 @@
 
 #. Add extra shortcut ESCAPE
-#.
+#. 
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
@@ -1908,5 +1911,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2196,7 +2199,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Feil under nedlasting"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2230,6 +2233,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2362,9 +2365,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift"
-"+slipp synkroniserer audio i dette punktet."
+"Drag play head and release near track to play audio from there; "
+"SHIFT+release to synchronize audio at that point."
+msgstr ""
+"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; "
+"Shift+slipp synkroniserer audio i dette punktet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
@@ -2491,68 +2494,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Søk …"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Søk etter objekt."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Skriv inn søketekst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "erstatt utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "legg til i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "fjern fra utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "skill mellom store/små bokstaver"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regulært uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Nan</b> – «Nan» finnes innen navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> – nøkkel «type» med eksakt verdi «route»."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2562,38 +2565,39 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Nan</b> – «Nan» finnes ikke innen navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> – nøkkel «foot» med hvilken som helst verdi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Spesialsøk:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgstr ""
+"<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2601,5 +2605,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2607,11 +2611,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2619,5 +2623,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2625,21 +2633,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> – alle endrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> – alle objekter i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> – alle uferdige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> – alle objekter uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2647,5 +2655,5 @@
 "<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2653,13 +2661,13 @@
 "<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2667,11 +2675,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2679,38 +2687,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Fant ingen treff for «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2718,5 +2726,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2724,5 +2732,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2730,5 +2738,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2746,51 +2754,54 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2816,5 +2827,6 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
+msgstr ""
+"{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
@@ -2854,5 +2866,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3062,11 +3074,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you do not see) "
-"might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have "
+"downloaded.<br>This can cause problems because other objects (that you do "
+"not see) might use them.<br>Do you really want to delete?"
 msgstr ""
 "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
-"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se "
-"nå) .<br>Er du sikker på at du vil slette nodene?"
+"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se nå) "
+".<br>Er du sikker på at du vil slette nodene?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:459
@@ -3330,6 +3342,6 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to "
+"<br>{0}<br> and creating a new default preference file.</html>"
 msgstr ""
 
@@ -3412,5 +3424,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3419,5 +3431,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3426,5 +3438,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3461,5 +3473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3512,5 +3524,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3518,5 +3530,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3524,17 +3536,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "tekst"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3542,5 +3548,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3549,5 +3555,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3555,5 +3561,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3561,5 +3567,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3567,42 +3573,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3611,5 +3617,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3617,5 +3623,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3671,5 +3677,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3679,81 +3686,81 @@
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Fant mer enn én linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Fant mer enn én linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Fant mer enn én \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukjent rolle «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukjent medlemstype for «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Fant ingen linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Fant ingen linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Fant ingen node eller linje med «via»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Fant ikke stil for restriksjon {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil for ytre linje «{0}» passer ikke."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Feil: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3927,5 +3934,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3996,5 +4004,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4004,5 +4012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4011,5 +4019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4018,5 +4026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4025,5 +4033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4032,5 +4040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4039,9 +4047,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4184,5 +4192,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
+msgstr ""
+"Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -4222,5 +4231,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
+msgstr ""
+"Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
@@ -4358,6 +4368,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4372,4 +4382,5 @@
 msgstr "Endre"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4563,5 +4574,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4600,6 +4611,6 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+"too.</html>"
 msgstr ""
 
@@ -4630,5 +4641,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4637,5 +4648,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4644,5 +4655,5 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4872,5 +4883,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte "
@@ -4901,6 +4913,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4912,5 +4925,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Ned"
@@ -4955,6 +4968,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
 msgstr ""
 "<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
@@ -4964,6 +4977,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
 msgstr ""
 "<html>Trykk <strong>{0}</strong> for å avslutte sammenslåingen av lokal- og "
@@ -5011,14 +5024,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+msgstr ""
+"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-msgstr ""
-"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: {0}"
-"</html>"
+"<html>An error occurred while communicating with the server<br>Details: "
+"{0}</html>"
+msgstr ""
+"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: "
+"{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5208,5 +5222,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+msgstr ""
+"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
@@ -5238,6 +5253,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5250,6 +5265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5547,7 +5562,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
 msgid ""
-"<html>Select to show changesets for the currently selected objects only."
-"<br>Unselect to show all changesets for objects in the current data layer.</"
-"html>"
+"<html>Select to show changesets for the currently selected objects "
+"only.<br>Unselect to show all changesets for objects in the current data "
+"layer.</html>"
 msgstr ""
 
@@ -5572,5 +5587,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5588,6 +5604,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5611,5 +5626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5617,5 +5632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5688,9 +5703,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5708,13 +5724,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5723,45 +5739,41 @@
 msgstr "Legg til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5988,10 +6000,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6332,4 +6344,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7443,6 +7456,6 @@
 #, java-format
 msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: {0}"
-"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
 
@@ -7466,8 +7479,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
 msgid ""
-"<html>Please select one the following <strong>standard queries</strong>."
-"Select <strong>Download my changesets only</strong> if you only want to "
-"download changesets created by yourself.<br>Note that JOSM will download "
-"max. 100 changesets.</html>"
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
 msgstr ""
 
@@ -7587,5 +7600,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7594,23 +7607,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7619,5 +7632,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7626,77 +7639,81 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Velg de objekter, du vil rette egenskaper for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7811,6 +7828,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is discouraged."
-"<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is "
+"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 
@@ -7828,6 +7845,6 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
-"html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation "
+"member?</html>"
 msgstr ""
 
@@ -7982,6 +7999,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8316,6 +8334,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8375,4 +8394,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8455,6 +8475,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
-"a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
+"english</a>.</p></html>"
 msgstr ""
 
@@ -8464,6 +8484,6 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
+"could not be loaded. The error message is "
+"(untranslated):<br><tt>{1}</tt></p></html>"
 msgstr ""
 
@@ -8562,5 +8582,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
+msgstr ""
+"Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8581,5 +8602,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
+msgstr ""
+"Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -8741,8 +8763,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Upplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
@@ -8751,6 +8774,6 @@
 "{2}, lokal versjon er {3}.<br><br>Trykk <strong>{4}</strong> for å "
 "synkronisere kun konfliktelementet.<br>Trykk <strong>{5}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{6}</"
-"strong> for å gå tilbake og fortsette å redigere.<br></html>"
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk "
+"<strong>{6}</strong> for å gå tilbake og fortsette å redigere.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8764,12 +8787,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
 "av en node, linje ellerrelasjon.<br><br>Trykk <strong>{0}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{1}</"
-"strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk "
+"<strong>{1}</strong> for å avbryte operasjonen og fortsette å "
+"redigere.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9004,5 +9029,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9019,5 +9044,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9102,6 +9128,6 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a file:</"
-"html>"
+"file for each of them or discard the changes.<br>Layers without a "
+"file:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9115,6 +9141,6 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
-"written.<br>Either select another file for this layer or discard the changes."
-"<br>Layer with a non-writable file:</html>"
+"written.<br>Either select another file for this layer or discard the "
+"changes.<br>Layer with a non-writable file:</html>"
 msgid_plural ""
 "<html>{0} layers need saving but have associated files<br>which cannot be "
@@ -9340,5 +9366,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9364,5 +9390,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9417,6 +9444,6 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
-"strong> using <strong>{1} requests</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple "
+"changesets</strong> using <strong>{1} requests</strong>"
 msgstr ""
 
@@ -9470,7 +9497,7 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
-"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
-"editing.<br>"
+"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
+"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
+"map editing.<br>"
 msgstr ""
 
@@ -9480,5 +9507,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9503,5 +9530,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9719,7 +9747,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points do not include a timestamp we cannot "
+"correlate them with audio data.</html>"
 msgstr ""
 
@@ -9745,7 +9773,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points do not include a timestamp we cannot "
+"correlate them with images.</html>"
 msgstr ""
 
@@ -9809,6 +9837,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Opplasting av ubehandlede GPS-data som kortdata betraktes som "
@@ -9824,5 +9852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9992,6 +10020,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:</html>"
 msgstr ""
 
@@ -10051,10 +10079,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the time."
-"<br>Display that photo here.<br>And then, simply capture the time you read "
-"on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Ta et bilde av din GPS mottaker når den viser tid.<br>Vis bildet her."
-"<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the "
+"time.<br>Display that photo here.<br>And then, simply capture the time you "
+"read on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Ta et bilde av din GPS mottaker når den viser tid.<br>Vis bildet "
+"her.<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10120,64 +10148,68 @@
 msgstr "Automatisk forslag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Tidssone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Forskyvning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Jevnfør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10187,20 +10219,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidssone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10209,5 +10241,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10217,21 +10249,21 @@
 "synkronisere bildene manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Valgte foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10239,17 +10271,17 @@
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Du bør velge et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10260,5 +10292,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10311,14 +10343,14 @@
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10327,5 +10359,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10334,10 +10366,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10346,5 +10378,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10636,6 +10668,6 @@
 "<html>Run a fully automatic procedure to get an access token from the OSM "
 "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorizes the user and retrieves an Access Token.</"
-"html>"
+"fully<br>automatically authorizes the user and retrieves an Access "
+"Token.</html>"
 msgstr ""
 
@@ -10657,8 +10689,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
 msgid ""
-"Please enter your OSM user name and password. The password will <strong>not</"
-"strong> be saved in clear text in the JOSM preferences and it will be "
-"submitted to the OSM server <strong>only once</strong>. Subsequent data "
-"upload requests don't use your password any more."
+"Please enter your OSM user name and password. The password will "
+"<strong>not</strong> be saved in clear text in the JOSM preferences and it "
+"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
+"data upload requests don't use your password any more."
 msgstr ""
 
@@ -10778,6 +10810,6 @@
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
-"<br><br>Please check username and password and try again.</html>"
+"OSM server failed. JOSM failed to log into {0}<br>for user "
+"{1}.<br><br>Please check username and password and try again.</html>"
 msgstr ""
 
@@ -10887,5 +10919,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11019,8 +11052,8 @@
 "authorization page in an external browser. Please login with your OSM "
 "username and password and follow the instructions to authorize the Request "
-"Token. Then switch back to this dialog and click on <strong>{0}</"
-"strong><br><br>If launching the external browser fails you can copy the "
-"following authorize URL and paste it into the address field of your browser."
-"</html>"
+"Token. Then switch back to this dialog and click on "
+"<strong>{0}</strong><br><br>If launching the external browser fails you can "
+"copy the following authorize URL and paste it into the address field of your "
+"browser.</html>"
 msgstr ""
 
@@ -11103,8 +11136,8 @@
 msgid ""
 "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, though."
-"<br>Depending on what rights are granted to this token you may nevertheless "
-"use it<br>to upload data, upload GPS traces, and/or access other protected "
-"resources.</html>"
+"test to retrieve the user details for this token failed, "
+"though.<br>Depending on what rights are granted to this token you may "
+"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
+"other protected resources.</html>"
 msgstr ""
 
@@ -11131,7 +11164,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
 msgid ""
-"<html>The test failed because the server responded with an internal error."
-"<br>JOSM could not decide whether the token is valid. Please try again later."
-"</html>"
+"<html>The test failed because the server responded with an internal "
+"error.<br>JOSM could not decide whether the token is valid. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -11204,26 +11237,22 @@
 msgstr "Vis live lydspor."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Opprett markører uten lyd når GPX-data leses."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Separate waypoints med gyldig tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Separate waypoints med tid estimert fra posisjon i track."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Trackpoints med navn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Endrede tidsmarker (time stamps) i audio filer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
@@ -11231,9 +11260,9 @@
 "tilgjengelig)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Vis eller skjul lydmeny-punktet i hovedmenyen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11243,5 +11272,5 @@
 "innspilt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11250,21 +11279,15 @@
 "Sett tekst på lydspor (og bilde og web) merker sammen med knappe ikoner."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Når lyd importeres, opprett markører fra  …"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Når lyd importeres, tilknyt den til ethvert waypoint i GPX-laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11274,5 +11297,5 @@
 "navn eller beskrivelse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11282,5 +11305,5 @@
 "importert  WAV fil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11289,17 +11312,17 @@
 "Antall sekunder for forover eller bakover hopp ved trykk på aktuell knapp"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Forover/bakover tid (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Multiplikasjon benyttet ved fast forward"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Rask avspilling multiplikator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11309,13 +11332,13 @@
 "posisjon for lydsporet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Tid på innledning (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "Forholdet mellom stemme recorder tid og sann tid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Stemme  recorder kalibrering"
@@ -11355,5 +11378,5 @@
 msgstr "Farger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11364,34 +11387,34 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Tegn linjer selv om ingen segmenter ble importert."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -11399,5 +11422,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11419,5 +11442,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11459,5 +11482,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11471,50 +11494,60 @@
 msgstr "Til fots"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig opptegning (ser uryddig ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Bare ved enden af linjen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle noder i utvalg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i annen farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11524,9 +11557,9 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11535,10 +11568,10 @@
 "alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11546,30 +11579,32 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Tegn retningspiler ved hjelp av tabellopslag i stedet for kompleks matematik."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+msgstr ""
+"Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11579,9 +11614,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11589,46 +11624,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter forskjellig gjennomsnitt hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11700,5 +11736,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11747,6 +11784,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11823,6 +11860,6 @@
 "a menu entry of a button for the first time. So some of your changes may "
 "become active even without restart --- but also without collision handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes here."
-"</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes "
+"here.</p>"
 msgstr ""
 
@@ -11835,9 +11872,9 @@
 "keyboard do not have them, Sun keyboards do), then do not use it. Also there "
 "are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
-"'':''/Colon). Please do not use them either, use the base key ('';''/"
-"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
-"Not doing so may result in conflicts, as there is no way for JOSM to know "
-"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
-"p>"
+"'':''/Colon). Please do not use them either, use the base key "
+"('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) "
+"instead. Not doing so may result in conflicts, as there is no way for JOSM "
+"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
+"keyboard.</p>"
 msgstr ""
 
@@ -12136,6 +12173,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources from<br>''{0}''."
-"<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources "
+"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -12257,6 +12294,6 @@
 #, java-format
 msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API server."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"<html>Failed to build URL ''{0}'' for validating the OSM API "
+"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12278,6 +12315,6 @@
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of 200."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"at<br>''{1}''. The server responded with the return code {0} instead of "
+"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12355,5 +12392,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12369,5 +12407,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12461,6 +12500,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
 msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
+"Use standard system settings (disabled. Start JOSM with <tt>-"
+"Djava.net.useSystemProxies=true</tt> to enable)"
 msgstr ""
 
@@ -12756,5 +12795,5 @@
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
@@ -12939,5 +12978,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13219,5 +13259,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»"
+"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste "
+"«{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
@@ -13330,6 +13371,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
+"<html>An error occurred while restoring backup file.<br>Error "
+"is:<br>{0}</html>"
 msgstr ""
 
@@ -13357,6 +13398,6 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Missing manadatory attributes on element ''bounds''. Got "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -13398,5 +13439,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13827,14 +13869,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13843,23 +13890,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13867,5 +13909,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13873,17 +13915,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13891,5 +13933,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13901,42 +13943,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Behold programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13945,5 +13987,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13952,21 +13994,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -13974,9 +14017,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13986,14 +14029,14 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14034,5 +14077,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14094,5 +14138,5 @@
 
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 msgid "Do nothing"
@@ -14175,6 +14219,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
+"current<br>dataset violates a precondition.<br>The error message "
+"is:<br>{0}</html>"
 msgstr ""
 "<html>Opplasting til tjeneren <strong>feilet</strong> fordi nåværende "
@@ -14184,7 +14228,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' failed."
-"<br>Please check the username and the password in the JOSM preferences.</"
-"html>"
+"<html>Authentication at the OSM server with the username ''{0}'' "
+"failed.<br>Please check the username and the password in the JOSM "
+"preferences.</html>"
 msgstr ""
 
@@ -14192,7 +14236,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
+"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
+"token.</html>"
 msgstr ""
 
@@ -14200,8 +14244,8 @@
 #, java-format
 msgid ""
-"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorised to access the protected resource<br>''{1}''."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
+"failed.<br>The token is not authorised to access the protected "
+"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
+"another OAuth token.</html>"
 msgstr ""
 
@@ -14221,7 +14265,7 @@
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
-"replied<br>the following error code and the following error message:"
-"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
-"strong>: {2}</html>"
+"replied<br>the following error code and the following error "
+"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
+"(untranslated)</strong>: {2}</html>"
 msgstr ""
 
@@ -14290,6 +14334,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14301,7 +14346,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
 msgid ""
-"The area you tried to download is too big or your request was too large."
-"<br>Either request a smaller area or use an export file provided by the OSM "
-"community."
+"The area you tried to download is too big or your request was too "
+"large.<br>Either request a smaller area or use an export file provided by "
+"the OSM community."
 msgstr ""
 
@@ -14333,9 +14378,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15004,7 +15049,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15014,5 +15059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15022,5 +15067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15036,5 +15081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15044,5 +15089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15073,5 +15118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15080,5 +15125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15087,5 +15132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15094,5 +15139,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15101,5 +15146,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15108,5 +15153,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15140,14 +15185,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"Et eget programtillegg for fransk Cadastre wms (matrikkel) på www.cadastre."
-"gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): <br><a href="
-"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
+msgstr ""
+"Et eget programtillegg for fransk Cadastre wms (matrikkel) på "
+"www.cadastre.gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): "
+"<br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
 "<BR>før du laster inn data med dette programtillegget."
@@ -15160,6 +15208,6 @@
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
-"<html>Verdien på \"source\" er aktivisert ved automatisk kildeangivelse</"
-"html>"
+"<html>Verdien på \"source\" er aktivisert ved automatisk "
+"kildeangivelse</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
@@ -15637,34 +15685,35 @@
 msgstr "Feil Lambert sone på mellomlager"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Bruk"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Velg en fargepalett"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Fargepalett"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Velg fargepalett for sletting"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Velg fargepalett i lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Lagre de brukte fargene i en ny farge palett."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Fjern valgte palett fra lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Farge Palett"
@@ -15737,5 +15786,5 @@
 msgstr "Lag for redigering av GPX-spor"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konverter til GPX lag med anonymisert tid"
@@ -15826,4 +15875,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16036,5 +16086,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16155,5 +16205,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
@@ -16176,6 +16227,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Nøyaktighet på Douglas-Peucker linjeforenkling, målt i grader.<br>Lave "
@@ -16465,7 +16517,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com."
-"<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du bytte til den "
-"nye tjeneren? (Anbefalt)</html>"
+"<html>Openstreetbugs-tillegget bruker den gamle tjeneren på "
+"appspot.com.<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du "
+"bytte til den nye tjeneren? (Anbefalt)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -16492,5 +16544,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
 
@@ -16604,5 +16657,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16654,5 +16708,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -16944,5 +16999,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
+msgstr ""
+"Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -17475,4 +17531,12 @@
 msgstr "Terasse"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17917,6 +17981,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
 msgid ""
-"Development of the turn restriction plugin was sponsored by <a href=\"http://"
-"www.skobbler.de\">skobbler GmbH</a>."
+"Development of the turn restriction plugin was sponsored by <a "
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
 
@@ -18002,8 +18066,8 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
-"a turn restriction, the way with role <tt>from</tt> should be different from "
-"the way with role <tt>to</tt>, though."
+"This turn restriction uses the OSM way <span class=\"object-"
+"name\">{0}</span> with role <tt>from</tt> <strong>and</strong> with role "
+"<tt>to</tt>. In a turn restriction, the way with role <tt>from</tt> should "
+"be different from the way with role <tt>to</tt>, though."
 msgstr ""
 
@@ -18057,8 +18121,8 @@
 "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
 "<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
-"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
-"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
-"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
-"object."
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-"
+"name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It is "
+"recommended to set <span class=\"object-name\">{2}</span> as unique "
+"<strong>via</strong>-object."
 msgstr ""
 
@@ -18170,6 +18234,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18177,6 +18241,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18687,5 +18751,6 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
+msgstr ""
+"Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:157
@@ -18817,9 +18882,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"Kildene (URL eller filnavn) for stavekontroll (se http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) eller \"tag checking data files\"."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
+msgstr ""
+"Kildene (URL eller filnavn) for stavekontroll (se "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) eller \"tag "
+"checking data files\"."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
@@ -18965,5 +19032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19008,5 +19075,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
+msgstr ""
+"Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
@@ -19044,5 +19112,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:36
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning."
+msgstr ""
+"Testen finner linjer som elver, land eller kystlinje med feil retning."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:70
@@ -19063,5 +19132,5 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19438,9 +19507,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19451,10 +19517,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Database er tatt ned for vedlikehold"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19464,25 +19530,25 @@
 "mindre område eller bruk planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "kunne ikke hente lyd fra URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Ingen lydenhet tilgjengelig"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Dine redigeringer må være offentlig frigitt for å laste opp nye data"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19490,17 +19556,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "skog"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19508,7 +19574,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19518,5 +19584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19559,5 +19625,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19567,5 +19633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19575,5 +19641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19583,8 +19649,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19598,5 +19664,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19607,5 +19673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19614,7 +19680,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19624,5 +19690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19632,5 +19698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19640,5 +19706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19648,5 +19714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19656,5 +19722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19664,5 +19730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19672,8 +19738,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19683,58 +19749,60 @@
 msgstr "rute"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Valgfrie attributter:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "ingen kombinasjon"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Fullt navn"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Gjerdetrapp"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Hjemmeside"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Forstørr"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Ny rolle"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Lag ny node."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Lagre"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19812,5 +19880,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
@@ -19996,6 +20065,13 @@
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20004,5 +20080,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20011,10 +20087,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20025,5 +20101,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20033,5 +20109,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20040,15 +20116,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20057,8 +20133,9 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
+msgstr ""
+"Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
 
 #. <!--
@@ -20945,7 +21022,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21085,8 +21162,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#.
+#. 
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -21296,5 +21373,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21304,5 +21381,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21321,5 +21398,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21329,5 +21406,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21346,5 +21423,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21354,5 +21431,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21371,5 +21448,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21379,5 +21456,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21392,5 +21469,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21408,5 +21485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21424,5 +21501,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21431,5 +21508,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21439,5 +21516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21457,5 +21534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21464,5 +21541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21472,5 +21549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22174,5 +22251,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22223,5 +22300,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22318,5 +22395,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22484,5 +22561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22816,5 +22893,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22824,5 +22901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22832,5 +22909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22840,5 +22917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22848,5 +22925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22856,5 +22933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22864,5 +22941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22873,5 +22950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24291,5 +24368,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24299,5 +24376,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24307,5 +24384,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24315,5 +24392,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24677,7 +24754,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24687,5 +24764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24695,5 +24772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24703,5 +24780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24711,5 +24788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24719,5 +24796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24727,5 +24804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24735,5 +24812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24743,5 +24820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24751,5 +24828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24759,5 +24836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24767,5 +24844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24775,5 +24852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24783,5 +24860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24791,5 +24868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24799,5 +24876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24807,5 +24884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24815,5 +24892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24823,5 +24900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24831,5 +24908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24839,5 +24916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24847,5 +24924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24855,5 +24932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24863,5 +24940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24871,5 +24948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24879,5 +24956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24887,5 +24964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24895,5 +24972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24903,5 +24980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24911,5 +24988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24919,5 +24996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24927,5 +25004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24935,5 +25012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24943,5 +25020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24951,5 +25028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24959,5 +25036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24967,5 +25044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24975,5 +25052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24983,5 +25060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24991,5 +25068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24999,5 +25076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25007,5 +25084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25015,5 +25092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25023,5 +25100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25031,5 +25108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25039,5 +25116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25047,5 +25124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26751,7 +26828,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26761,5 +26838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26769,5 +26846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26777,5 +26854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26785,5 +26862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26793,5 +26870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26801,5 +26878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26809,5 +26886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26817,5 +26894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28238,5 +28315,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28252,5 +28329,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28260,5 +28337,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28269,5 +28346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28280,7 +28357,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28290,5 +28367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28298,5 +28375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28306,5 +28383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28314,5 +28391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28346,5 +28423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28360,5 +28437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28368,5 +28445,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28375,5 +28452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28383,5 +28460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28392,5 +28469,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28415,5 +28492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28528,9 +28605,9 @@
 #. 7. scale_min / scale_max
 #. - zoom scale for display
-#.
+#. 
 #. Using both area and line attributes for the same key/value pair does work. For areas
 #. first the best matching area rule is searched and the best matching line rule is
 #. connected with it. They need not have the same key/value pair.
-#.
+#. 
 #. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
 #. If both are given, the color name is introduced in preferences with that value. If only
@@ -28538,5 +28615,5 @@
 #. modified preferences or previous value is used. The 6 hex digit color code can also
 #. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
+#. 
 #. Linemod's are drawn over or under the line they are associated with and modify the
 #. appearance. There can be multiple linemod's for one way (contrary to line styles,
@@ -28546,8 +28623,8 @@
 #. on the sides of the way or the waystyles itself must use alpha channel (which may
 #. look strange).
-#.
+#. 
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
 #. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
+#. 
 #. For external files the <rules> should have following elements:
 #. - author           the author of the style
@@ -28561,5 +28638,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28567,5 +28644,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28614,6 +28691,6 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -28693,5 +28770,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28701,11 +28778,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28721,5 +28798,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28728,5 +28805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28735,5 +28812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28749,5 +28826,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28761,5 +28838,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28768,5 +28845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28775,5 +28852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28782,5 +28859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28789,5 +28866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28796,5 +28873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28803,5 +28880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28810,5 +28887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28817,5 +28894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28824,5 +28901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28831,5 +28908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28838,5 +28915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28845,5 +28922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28852,5 +28929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28859,5 +28936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29034,7 +29111,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29048,5 +29125,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29056,7 +29133,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29066,5 +29143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29074,5 +29151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29082,5 +29159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29090,5 +29167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29104,5 +29181,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29111,5 +29188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29119,5 +29196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29126,5 +29203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29133,5 +29210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29140,5 +29217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29147,5 +29224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29154,5 +29231,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29161,5 +29238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29168,5 +29245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29175,5 +29252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29182,5 +29259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29194,5 +29271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29206,5 +29283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29213,5 +29290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29225,5 +29302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29238,5 +29315,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29251,5 +29328,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29263,5 +29340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29275,5 +29352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29282,5 +29359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29289,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29297,5 +29374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29304,5 +29381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29311,5 +29388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29318,5 +29395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29326,5 +29403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29335,5 +29412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29343,7 +29420,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29353,5 +29430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29361,5 +29438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29369,5 +29446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29378,5 +29455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29385,5 +29462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29393,5 +29470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29401,5 +29478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29409,5 +29486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29417,5 +29494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29425,5 +29502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29433,5 +29510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29441,5 +29518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29449,5 +29526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29457,5 +29534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29478,5 +29555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29491,7 +29568,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29501,5 +29578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29508,5 +29585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29516,5 +29593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29523,5 +29600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29531,5 +29608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29539,5 +29616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29553,5 +29630,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29562,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29579,5 +29656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29587,5 +29664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29598,5 +29675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29615,5 +29692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29622,5 +29699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29629,5 +29706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29636,7 +29713,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29647,5 +29724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29660,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29672,5 +29749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29680,5 +29757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29692,5 +29769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29704,5 +29781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29711,5 +29788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29718,7 +29795,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29728,5 +29805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29736,5 +29813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29744,5 +29821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29752,5 +29829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29760,5 +29837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29774,7 +29851,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29789,5 +29866,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29802,5 +29879,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29815,5 +29892,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29828,5 +29905,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29841,5 +29918,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29854,7 +29931,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29864,5 +29941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29871,5 +29948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29879,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29887,5 +29964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29895,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29903,5 +29980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29911,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29919,5 +29996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29927,5 +30004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29935,5 +30012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29943,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29951,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29959,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29977,5 +30054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29990,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30001,7 +30078,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30011,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30019,5 +30096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30027,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30035,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30043,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30051,5 +30128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30059,5 +30136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30067,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30075,5 +30152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30083,5 +30160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30091,5 +30168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30099,5 +30176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30107,5 +30184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30115,5 +30192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30123,5 +30200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30131,5 +30208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30151,5 +30228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30163,7 +30240,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30173,5 +30250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30181,5 +30258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30189,5 +30266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30197,5 +30274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30205,5 +30282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30213,5 +30290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30221,5 +30298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30229,5 +30306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30237,5 +30314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30245,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30262,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30270,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30278,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30286,5 +30363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30294,5 +30371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30302,5 +30379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30310,5 +30387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30318,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30326,5 +30403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30334,5 +30411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30342,5 +30419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30350,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30367,5 +30444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30374,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30382,5 +30459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30389,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30397,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30405,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30413,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30420,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30428,5 +30505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30436,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30444,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30452,5 +30529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30459,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30466,5 +30543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30473,5 +30550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30480,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30487,5 +30564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30494,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30501,5 +30578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30508,5 +30585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30515,5 +30592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30522,5 +30599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30529,5 +30606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30536,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30543,5 +30620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30551,5 +30628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30559,5 +30636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30567,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30575,5 +30652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30583,5 +30660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30591,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30599,5 +30676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30607,5 +30684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30615,5 +30692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30624,5 +30701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30632,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30640,5 +30717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30648,5 +30725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30656,5 +30733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30664,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30672,5 +30749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30680,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30688,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30696,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30704,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30712,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30720,5 +30797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30728,5 +30805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30736,5 +30813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30744,5 +30821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30752,5 +30829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30760,5 +30837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30768,5 +30845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30776,5 +30853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30783,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30813,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30821,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30829,7 +30906,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30844,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30852,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30860,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30868,5 +30945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30876,5 +30953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30884,5 +30961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30892,5 +30969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30906,7 +30983,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30916,5 +30993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30924,5 +31001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30932,5 +31009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30940,5 +31017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30948,5 +31025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30956,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30964,5 +31041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30972,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30980,5 +31057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30988,5 +31065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30996,5 +31073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31004,5 +31081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31012,5 +31089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31020,5 +31097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31028,5 +31105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31036,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31044,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31052,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31060,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31068,5 +31145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31076,5 +31153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31084,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31092,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31100,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31108,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31116,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31124,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31132,5 +31209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31140,5 +31217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31148,5 +31225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31156,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31164,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31172,5 +31249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31180,5 +31257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31188,5 +31265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31196,5 +31273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31204,5 +31281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31212,5 +31289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31220,5 +31297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31228,5 +31305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31236,5 +31313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31244,5 +31321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31278,7 +31355,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31288,5 +31365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31296,5 +31373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31304,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31312,5 +31389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31320,5 +31397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31328,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31336,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31351,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31359,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31367,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31375,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31383,5 +31460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31391,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31400,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31408,5 +31485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31416,5 +31493,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31424,5 +31501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31431,5 +31508,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31438,5 +31515,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31454,7 +31531,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31464,5 +31541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31472,5 +31549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31480,5 +31557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31488,5 +31565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31496,5 +31573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31504,5 +31581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31512,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31520,5 +31597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31528,5 +31605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31544,5 +31621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31556,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31568,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31576,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31588,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31600,6 +31677,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31609,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31621,5 +31698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31633,5 +31710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31645,5 +31722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31657,5 +31734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31669,5 +31746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31677,7 +31754,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31687,5 +31764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31695,5 +31772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31703,5 +31780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31711,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31726,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31737,5 +31814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31749,5 +31826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31761,5 +31838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31773,5 +31850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31782,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31790,5 +31867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31798,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31806,5 +31883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31814,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31829,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31841,5 +31918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31853,5 +31930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31865,5 +31942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31877,5 +31954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31890,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -31914,5 +31991,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31923,11 +32000,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31937,5 +32014,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31945,5 +32022,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31953,5 +32030,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31961,5 +32038,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31969,5 +32046,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31977,5 +32054,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31985,5 +32062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31993,5 +32070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32001,5 +32078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32009,5 +32086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32017,5 +32094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32025,5 +32102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32043,5 +32120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32136,5 +32213,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32142,28 +32219,28 @@
 #. relation    - a relation
 #. *           - all data types
-#.
+#. 
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#.
+#. 
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#.
+#. 
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#.
+#. 
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#.
+#. 
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#.
+#. 
 #. The comment at the end of a rule is displayed in validator description
-#.
+#. 
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -32278,5 +32355,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32289,5 +32366,5 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#.
+#. 
 #. different forms for web access
 #. must be html:<url>
@@ -32312,6 +32389,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32320,6 +32397,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32334,6 +32411,6 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#.
-#.
+#. 
+#. 
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -32347,6 +32424,6 @@
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#.
-#.
+#. 
+#. 
 #. only for GB
 #. fails with division by zero error
@@ -32366,6 +32443,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32389,6 +32466,6 @@
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#.
-#.
+#. 
+#. 
 #. only for Italy
 #: build/trans_wms.java:46
@@ -32419,10 +32496,11 @@
 #~ msgstr "JOSM hjelpesider"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Feil ved nedlasting av {0}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still want "
+#~ "to merge them?"
 #~ msgstr ""
 #~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles "
@@ -32442,9 +32520,8 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this as "
+#~ "a bug."
 #~ msgstr ""
-#~ "Feilmelding: cannot check conditions for no layer. Send inn en "
-#~ "feilmelding."
+#~ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding."
 
 #~ msgid "No document open so nothing to save."
@@ -32461,9 +32538,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
 #~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -32480,4 +32557,5 @@
 #~ msgstr "Forventer parentes slutt."
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
@@ -32507,4 +32585,5 @@
 #~ msgstr "rett versjon"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32527,4 +32606,5 @@
 #~ msgstr "Konflikter ved sammenføyning."
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Kommandoliste: {0}"
@@ -32537,13 +32617,13 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
-#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i "
-#~ "historikk."
+#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i historikk."
 
 #~ msgid "Delete the selected layer."
 #~ msgstr "Slett valgt Lag."
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lag: {0}"
@@ -32573,7 +32653,9 @@
 #~ msgstr "Flytt ned"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relasjons-editor: {0}"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Opphavsmenn: {0}"
@@ -32612,16 +32694,21 @@
 #~ msgstr "Ingen bilder med lesbare tidsstempler funnet"
 
+#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Ingen tid gitt for punkt {0} x {1}"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Bilder for {0}"
 
+#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS start: {0}"
 
+#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "nåværende forskjell: {0}s"
 
+#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-slutt: {0}"
@@ -32632,4 +32719,5 @@
 #~ msgstr[1] "bilder"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} innenfor sporet."
@@ -32649,4 +32737,7 @@
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Opprett markører uten lyd når GPX-data leses."
 
 #~ msgid "Update"
@@ -32726,4 +32817,5 @@
 #~ msgstr "Fandt <member>-element i en ikke-relation."
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32735,4 +32827,5 @@
 #~ " {0}"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32740,26 +32833,28 @@
 #~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM."
 
+#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
 #~ msgstr ""
-#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned "
-#~ "automatisk."
-
+#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned automatisk."
+
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Fant ikke programtillegget: {0}."
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Programtillegget krever oppdatering {0} av JOSM."
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}"
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
+#~ "overwrite the existing ones."
 #~ msgstr ""
-#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang "
-#~ "til å skrive over eksisterende."
+#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang til å "
+#~ "skrive over eksisterende."
 
 #~ msgid ""
@@ -32767,6 +32862,6 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
-#~ "i oppstettet 'pluginmanager.warntime'.)"
+#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien i "
+#~ "oppstettet 'pluginmanager.warntime'.)"
 
 #~ msgid ""
@@ -32774,6 +32869,5 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM "
-#~ "utviklerne."
+#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne."
 
 #~ msgid "Download missing plugins"
@@ -32783,4 +32877,5 @@
 #~ msgstr "Programtillegg finnes allerede"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Venligst send en feilrapport på {0}"
@@ -32795,4 +32890,5 @@
 #~ msgstr "Husk å inkludere følgende informasjon:"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32801,12 +32897,12 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny "
-#~ "versjon over den eksisterende?\n"
+#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny versjon "
+#~ "over den eksisterende?\n"
 #~ "\n"
 #~ "{0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before reporting "
+#~ "a bug."
 #~ msgstr ""
 #~ "Prøv å oppdatere til siste versjon av JOSM og alle programtillegg før du "
@@ -32827,20 +32923,21 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</"
-#~ "html>"
+#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</html>"
 
 #~ msgid "GPX Track loaded"
 #~ msgstr "GPX-spor er lagt inn"
 
+#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Fant {0} treff av {1} i GPX spor {2}"
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You can "
+#~ "adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell "
 #~ "kobling."
 
+#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
@@ -32855,4 +32952,5 @@
 #~ msgstr "Lambert Zone 4 cache file (.4)"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Bytt til kartprojeksjonen {0}."
@@ -32879,6 +32977,6 @@
 #~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
@@ -32947,10 +33045,11 @@
 #~ msgstr "Hjelp / Om"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -32967,6 +33066,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -32975,6 +33074,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger "
-#~ "- disse vil vises i WMS menyen.\n"
+#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger - "
+#~ "disse vil vises i WMS menyen.\n"
 #~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
@@ -32987,17 +33086,16 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må "
-#~ "du bare oppgi gyldig 'id'.\n"
-#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i "
-#~ "dette eksempelet. Bytt ut  73 med din bilde id: \n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må du "
+#~ "bare oppgi gyldig 'id'.\n"
+#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i dette "
+#~ "eksempelet. Bytt ut  73 med din bilde id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i "
-#~ "tvil: la være å bruke bildet."
+#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i tvil: "
+#~ "la være å bruke bildet."
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr ""
-#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
+#~ msgstr "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
 
 #~ msgid "Please select the row to copy."
@@ -33013,6 +33111,6 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
+#~ "eg. deleting uninteresting parts of track."
 #~ msgstr ""
 #~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. "
@@ -33057,6 +33155,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want to "
+#~ "combine them?"
 #~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
 
@@ -33077,4 +33175,5 @@
 #~ msgstr "Splitt linje i segment"
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
@@ -33084,6 +33183,6 @@
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
+#~ "jump to position."
 #~ msgstr ""
 #~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå "
@@ -33108,4 +33207,5 @@
 #~ msgstr "sykkelkart"
 
+#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
@@ -33141,4 +33241,8 @@
 #~ msgstr "Datalag"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Feil under nedlasting"
+
+#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -33148,7 +33252,9 @@
 #~ "intervall, for eksempel nodes:10-20"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Koble til {0} …"
 
+#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall."
@@ -33158,12 +33264,13 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have "
+#~ "downloaded.<br>This can cause problems because other objects (that you don't "
+#~ "see) might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan "
-#~ "skape problemer fordi de kan være i bruk av andre objekter (som du ikke "
-#~ "kan se nå) .<br>Er du sikker på at du vil slette nodene?"
-
+#~ "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
+#~ "problemer fordi de kan være i bruk av andre objekter (som du ikke kan se nå) "
+#~ ".<br>Er du sikker på at du vil slette nodene?"
+
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
@@ -33195,6 +33302,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33211,4 +33317,5 @@
 #~ msgstr "Fant ikke fila"
 
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -33217,32 +33324,40 @@
 #~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: "
-#~ "gjeldende er {0}, maksimalt er {1}"
+#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
+#~ "er {0}, maksimalt er {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Klarte ikke starte API. Prøv igjen senere."
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "multipolygon-linje «{0}» er ikke lukket."
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Linje «{0}» med færre enn to punkter."
 
+#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
 
+#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Multipolygon-medlem «{0}» er ikke en linje."
 
+#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Ingen ytre linje for multipolygon «{0}»."
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Skjæring mellom linjene «{0}» og «{1}»."
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Indre linje «{0}» er utenfor."
@@ -33257,11 +33372,9 @@
 #~ "Er du sikker på at du vil fortsette?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
-#~ msgstr[0] ""
-#~ "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ msgstr[0] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
 #~ msgstr[1] ""
 #~ "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?"
@@ -33303,4 +33416,5 @@
 #~ msgstr "Objekt allerede slettet"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "fjerner henvisning fra vei {0}"
@@ -33315,4 +33429,5 @@
 #~ msgstr "OSM-brukernavn (e-post)"
 
+#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
@@ -33376,10 +33491,10 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
-#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
+#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to selected "
+#~ "user, opens browser showing selected author profile page."
 #~ msgstr ""
 #~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
@@ -33422,7 +33537,9 @@
 #~ msgstr "Feil antall parametere for nodes-operator."
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Klarte ikke lese fra URL: «{0}»"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33438,7 +33555,9 @@
 #~ "Ikke last opp data etter denne beskjeden."
 
+#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33456,13 +33575,17 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
+#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Klarte ikke tolke datoen i fila «{0}»."
 
+#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Feil i URL: «{0}»"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
@@ -33471,21 +33594,23 @@
 #~ msgstr "AgPifoJ – Geotaggede  bilder"
 
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+#~ "to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Det er {0} elementer i det lokale datasettet som<br>kan være "
-#~ "slettet på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere "
-#~ "dem, vil tjeneren sannsynligvis rapportere om en<br>konflikt."
-#~ "<br><br>Trykk <strong>{1}</strong> for å sjekke status for disse "
-#~ "elementene<br>på tjeneren.<br>Trykk <strong>{2}</strong> for å ignorere."
-#~ "<br></html>"
-
+#~ "<html>Det er {0} elementer i det lokale datasettet som<br>kan være slettet "
+#~ "på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere dem, vil "
+#~ "tjeneren sannsynligvis rapportere om en<br>konflikt.<br><br>Trykk "
+#~ "<strong>{1}</strong> for å sjekke status for disse elementene<br>på "
+#~ "tjeneren.<br>Trykk <strong>{2}</strong> for å ignorere.<br></html>"
+
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33494,6 +33619,6 @@
 #~ msgstr ""
 #~ "<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
-#~ "å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
-#~ "html>"
+#~ "å<br>slette allerede er slettet på "
+#~ "tjeneren.<br><br>Feilmelding:<br>{0}</html>"
 
 #~ msgid "parameter '{0}' must not be null"
@@ -33503,4 +33628,5 @@
 #~ msgstr "Bruk ufullstendige løsninger"
 
+#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
@@ -33516,6 +33642,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33531,6 +33657,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33542,6 +33668,6 @@
 #~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
 #~ "\n"
-#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach "
-#~ "folgendem Schema erledigen:\n"
+#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem "
+#~ "Schema erledigen:\n"
 #~ "wmsplugin.url.1.name=LandSat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -33560,7 +33686,8 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht "
-#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung."
-
+#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
+#~ "sind. Im Zweifel verzichten Sie auf die Nutzung."
+
+#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Lag {0} må være i listen over lag"
@@ -33578,10 +33705,12 @@
 #~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
 
+#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
 
+#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
@@ -33592,19 +33721,23 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A HREF="
-#~ "\"{1}\">norsk bokmål</A>."
-
+#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A "
+#~ "HREF=\"{1}\">norsk bokmål</A>."
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter «{0}» må ha en verdi"
 
+#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Uventet returverdi. Mottok {0}."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
@@ -33616,4 +33749,5 @@
 #~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
@@ -33625,13 +33759,17 @@
 #~ msgstr "Fant ingen siste versjon. Historikken er tom."
 
+#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
+#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "Uventet kolonneindeks: {0}"
 
+#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
+#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "Indeks er utenfor rekkevidde: {0}"
@@ -33640,17 +33778,20 @@
 #~ msgstr "Vis historikken for det valgte objektet"
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Klarte ikke lese «{0}»"
 
+#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 #~ msgstr ""
 #~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "
 #~ "«{1}»"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' kan ikke vœre null"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:41+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 13:33+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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -265,6 +265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -320,9 +320,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
@@ -345,9 +345,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
@@ -438,6 +438,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -654,12 +654,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -903,5 +903,6 @@
 #: ../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
@@ -1356,6 +1357,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
@@ -1455,5 +1456,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1474,5 +1476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1624,5 +1626,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden"
@@ -1645,5 +1648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1794,6 +1797,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
@@ -1854,5 +1857,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of"
@@ -1927,9 +1931,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)"
@@ -1946,5 +1950,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2239,7 +2243,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Fouten tijdens download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Fouten tijdens ophalen"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2273,7 +2277,7 @@
 msgstr "({0}/{1}) Laden van ouders van relatie {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Fouten tijdens ophalen"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2409,6 +2413,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 "
@@ -2537,110 +2541,111 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Geef een filter string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Voer een zoekopdracht in:"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Geef de zoekterm"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "Selectie vervangen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "Toevoegen aan selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "Verwijderen uit selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "zoek in selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "Reguliere expressie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr ""
+"<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Lange</b> - ''Lang'' ergens in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - sleutel ''type'' met exacte waarde ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<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:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Lange</b> - geen ''Lang'' in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - sleutel=foot, met een willekeurige waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciale zoekopdrachten:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - objecttype (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>gebruiker:</b>... - alle objecten veranderd door gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>user:anonymous</b> - alle objekten gewijzigd door anonieme gebruikers"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt met opgegeven ID (0 voor nieuwe objekten)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2648,5 +2653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2654,11 +2659,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2668,5 +2673,9 @@
 "max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2674,21 +2683,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle aangepaste objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle geselecteerde objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle incomplete objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>ongetagd</b> - alle objecten zonder tag"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2697,5 +2706,5 @@
 "voldoen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2704,13 +2713,13 @@
 "voldoen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2718,11 +2727,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Gebruik <b>(</b> en <b>)</b> om expressies te groeperen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2730,38 +2739,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Aktiveer filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Geen overeenkomst gevonden voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Niets gevonden in selectie met zoeken op \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2769,5 +2778,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2775,5 +2784,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2781,5 +2790,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2798,5 +2807,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2804,10 +2821,5 @@
 "van gebruik: sleutel=waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Patroon syntax fout: Patroon {0} in {1} is illegaal!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2815,36 +2827,36 @@
 "Onbekende primitief: {0}. Toegestane waarden zijn knoop, weg of relatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Onverwacht token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2915,5 +2927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3026,6 +3038,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
@@ -3127,7 +3139,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 "
@@ -3398,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 ""
 
@@ -3480,5 +3492,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3487,5 +3499,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3494,5 +3506,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3529,5 +3541,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3580,5 +3592,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3586,5 +3598,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3592,17 +3604,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "tekst"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3610,5 +3616,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3617,5 +3623,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3623,5 +3629,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3629,5 +3635,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3635,42 +3641,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3679,5 +3685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3685,5 +3691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3739,5 +3745,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3747,81 +3754,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stijl voor beperking {0} is niet gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Fout: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3995,5 +4002,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -4064,5 +4072,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4072,5 +4080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4079,5 +4087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4086,5 +4094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4093,5 +4101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4100,5 +4108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4107,9 +4115,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4265,6 +4273,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
@@ -4430,6 +4438,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4444,4 +4452,5 @@
 msgstr "Bewerken"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4637,5 +4646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4674,6 +4683,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 ""
 
@@ -4704,5 +4713,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"
@@ -4711,5 +4720,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"
@@ -4718,5 +4727,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"
@@ -4930,5 +4939,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4953,6 +4963,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4964,5 +4975,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Omlaag"
@@ -5007,6 +5018,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 ""
 
@@ -5014,6 +5025,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 ""
 
@@ -5064,6 +5075,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 ""
 
@@ -5280,6 +5291,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5292,6 +5303,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5589,7 +5600,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 ""
 
@@ -5614,5 +5625,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5630,6 +5642,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5649,9 +5660,10 @@
 #: ../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
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5659,5 +5671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5734,9 +5746,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5754,13 +5767,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5769,45 +5782,41 @@
 msgstr "Toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6034,10 +6043,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6091,5 +6100,6 @@
 #: ../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
@@ -6380,4 +6390,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7491,6 +7502,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 ""
 
@@ -7514,8 +7525,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 ""
 
@@ -7635,5 +7646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7642,23 +7653,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7667,5 +7678,5 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7674,77 +7685,81 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Lid van"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7859,6 +7874,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 ""
 
@@ -7876,6 +7891,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 ""
 
@@ -8030,6 +8045,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8342,5 +8358,6 @@
 #: ../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
@@ -8365,6 +8382,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8424,4 +8442,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8504,6 +8523,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 ""
 
@@ -8513,6 +8532,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 ""
 
@@ -8786,17 +8805,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>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
@@ -8810,13 +8830,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -8857,8 +8878,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
@@ -8870,5 +8891,6 @@
 #, 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
@@ -9059,5 +9081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9074,5 +9096,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9157,6 +9180,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] ""
@@ -9170,6 +9193,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 "
@@ -9395,5 +9418,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9419,5 +9442,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9472,6 +9496,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 ""
 
@@ -9525,7 +9549,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 ""
 
@@ -9535,5 +9559,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9560,5 +9584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Negeer uitzondering omdat versturen afgebroken is. De uitzondering is: {0}"
@@ -9777,7 +9802,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 ""
 
@@ -9803,7 +9828,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 ""
 
@@ -9867,6 +9892,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk "
@@ -9882,5 +9907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10050,6 +10075,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 ""
 
@@ -10109,7 +10134,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 "
@@ -10179,64 +10204,68 @@
 msgstr "Automatisch schatten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Verschuiving:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correleer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ongeldige verschuiving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10246,20 +10275,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tijdzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10268,5 +10297,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10274,21 +10303,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Koppelen van foto's aan track is mislukt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "De selecteerde foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10297,17 +10326,17 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX-track heeft geen tijdinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "U mag een GPX-track selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Geen GPX-tracks geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10318,5 +10347,5 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10369,14 +10398,14 @@
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10385,5 +10414,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10392,10 +10421,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10404,5 +10433,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10561,5 +10590,6 @@
 #: ../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
@@ -10696,6 +10726,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 ""
 
@@ -10717,8 +10747,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 ""
 
@@ -10838,6 +10868,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 ""
 
@@ -10947,5 +10977,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11079,8 +11110,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 ""
 
@@ -11163,8 +11194,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 ""
 
@@ -11191,7 +11222,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 ""
 
@@ -11262,34 +11293,31 @@
 msgstr "Live-geluidsspoor tonen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Expliciete waypoints met geldige tijdsaanduiding."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Expliciete waypoints met tijdsschatting uit trackpositie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Benoemde trackpunten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Aangepaste tijden (tijdsmarkeringen) van geluidsbestanden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgstr ""
+"Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "De geluidsmenuitem op de hoofdmenubalk tonen of verbergen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11299,5 +11327,5 @@
 "gesynchroniseerde track van het klinkende geluid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11307,24 +11335,16 @@
 "hun knoppictogrammen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
-"een GPX-laag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Bij importeren van geluid, maak markers van..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 "Bij importeren van geluid, pas het toe op ieder waypoint in de GPX-laag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11334,5 +11354,5 @@
 "met namen of beschrijvingen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11342,5 +11362,5 @@
 "aangepast tijd van ieder geïmporteerd WAV-bestand."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11350,18 +11370,18 @@
 "knop wordt ingedrukt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Vooruit-/achteruittijd (seconden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 "De waarde waarmee de snelheid is vermenigvuldigd voor snel doorspoelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Versterkingsfactor snel doorspoelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11371,14 +11391,14 @@
 "geluidsspoorpositie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Voorlooptijd (seconden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 "De verhouding tussen verstreken tijd van de geluidsopname en de werkelijkheid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Calibratie geluidsopname"
@@ -11418,5 +11438,5 @@
 msgstr "Kleuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11427,34 +11447,35 @@
 msgstr "Alles"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Geen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Grote GPS-punten tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Snelheid (rood = langzaam, groen = snel)"
 
+#: ../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)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -11462,5 +11483,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11482,5 +11503,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11522,5 +11543,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11534,50 +11555,62 @@
 msgstr "Te voet"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Teken richting pijlen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Grenzen gedownload gebied tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuele knopen in selectiemodus tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Inactieve lagen in andere kleur tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
+"een GPX-laag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11585,9 +11618,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11596,10 +11629,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11608,11 +11641,12 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "De richtingspijlen tekenen door te zoeken in tabellen i.p.v. ingewikkelde "
@@ -11620,5 +11654,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11627,13 +11661,13 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11643,9 +11677,9 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11653,29 +11687,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
@@ -11683,10 +11718,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11694,9 +11729,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-gegevens"
@@ -11768,5 +11803,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11815,6 +11851,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11891,6 +11927,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 ""
 
@@ -11903,9 +11939,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 ""
 
@@ -12051,5 +12087,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:151
 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
@@ -12072,5 +12109,6 @@
 #, 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
@@ -12205,6 +12243,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 ""
 
@@ -12326,6 +12364,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 ""
 
@@ -12347,6 +12385,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 ""
 
@@ -12425,5 +12463,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12439,5 +12478,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12531,6 +12571,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 ""
 
@@ -12826,5 +12866,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
@@ -13009,5 +13049,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13392,6 +13433,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 ""
 
@@ -13419,6 +13460,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 ""
 
@@ -13460,5 +13501,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13889,14 +13931,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13905,23 +13952,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13929,5 +13971,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13935,17 +13977,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13953,5 +13995,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13963,42 +14005,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Plugin uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14007,5 +14049,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14014,23 +14056,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de "
+"\"{0}\"-plugin."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de \"{0}"
-"\"-plugin."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Volgens de informatie in de plugin, is de auteur {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14039,9 +14081,9 @@
 "fout rapporteert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Moet de plugin worden uitgeschakeld?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14051,14 +14093,14 @@
 "uit de applicatie te halen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "geen omschrijving beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14099,5 +14141,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14159,5 +14202,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"
@@ -14240,6 +14283,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 ""
 
@@ -14247,7 +14290,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 ""
 
@@ -14255,7 +14298,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 ""
 
@@ -14263,8 +14306,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 ""
 
@@ -14284,7 +14327,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 ""
 
@@ -14353,6 +14396,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14364,7 +14408,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 ""
 
@@ -14396,9 +14440,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15032,5 +15076,6 @@
 #: ../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
@@ -15061,7 +15106,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15071,5 +15116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15079,5 +15124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15093,5 +15138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15101,5 +15146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15130,5 +15175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15137,5 +15182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15144,5 +15189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15151,5 +15196,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15158,5 +15203,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15165,5 +15210,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15197,10 +15242,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15693,34 +15739,35 @@
 msgstr "Fout in buffer Lambert-zone"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Gebruik"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Selecteer een schema om te gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Kleurenschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Selecteer het schema om te verwijderen."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Het geselecteerde schema uit de lijst gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "De huidige kleuren als nieuw kleurenschema gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Het geselecteerde schema uit de lijst verwijderen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Kleurenschema's"
@@ -15793,5 +15840,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15882,4 +15929,5 @@
 msgstr "Poort:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15945,6 +15993,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
@@ -16092,5 +16140,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16211,5 +16259,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
@@ -16233,9 +16282,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 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."
 
@@ -16359,5 +16409,6 @@
 #: ../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
@@ -16532,7 +16583,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
@@ -16547,5 +16598,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst"
@@ -16658,5 +16710,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16709,5 +16762,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17527,4 +17581,12 @@
 msgstr "Terras"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17969,6 +18031,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 ""
 
@@ -18054,8 +18116,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 ""
 
@@ -18109,8 +18171,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 ""
 
@@ -18222,6 +18284,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 ""
 
@@ -18229,6 +18291,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 ""
 
@@ -18876,10 +18938,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"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:744
@@ -19025,5 +19088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19127,5 +19190,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19505,9 +19568,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19518,10 +19578,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Vanwege onderhoud is de database niet bereikbaar"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19531,25 +19591,25 @@
 "groot. Kies een kleiner gebied of gebruik planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "Kan geen geluidsinvoerstroom uit invoer-URL krijgen"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr ""
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19557,17 +19617,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "bosbouw"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19575,7 +19635,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19585,5 +19645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19626,5 +19686,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19634,5 +19694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19642,5 +19702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19650,8 +19710,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19665,5 +19725,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19674,5 +19734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19681,7 +19741,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19691,5 +19751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19699,5 +19759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19707,5 +19767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19715,5 +19775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19723,5 +19783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19731,5 +19791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19739,8 +19799,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19750,58 +19810,60 @@
 msgstr "route"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Optionele attributen:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "geen aanpastoets"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Echte naam"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Overstap"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Startpagina"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "Taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Inzoomen"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nieuwe rol"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Nieuwe node maken."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Opslaan"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19872,5 +19934,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -20036,6 +20099,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20044,5 +20114,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20051,10 +20121,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20063,5 +20133,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20071,5 +20141,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20078,15 +20148,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20095,5 +20165,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20983,7 +21053,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21123,8 +21193,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"/>
@@ -21334,5 +21404,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21342,5 +21412,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21359,5 +21429,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21367,5 +21437,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21384,5 +21454,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21392,5 +21462,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21409,5 +21479,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21417,5 +21487,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21430,5 +21500,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21446,5 +21516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21462,5 +21532,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21469,5 +21539,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21477,5 +21547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21495,5 +21565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21502,5 +21572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21510,5 +21580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22212,5 +22282,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22261,5 +22331,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22356,5 +22426,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22522,5 +22592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22854,5 +22924,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22862,5 +22932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22870,5 +22940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22878,5 +22948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22886,5 +22956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22894,5 +22964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22902,5 +22972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22911,5 +22981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24329,5 +24399,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24337,5 +24407,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24345,5 +24415,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24353,5 +24423,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24715,7 +24785,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24725,5 +24795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24733,5 +24803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24741,5 +24811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24749,5 +24819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24757,5 +24827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24765,5 +24835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24773,5 +24843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24781,5 +24851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24789,5 +24859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24797,5 +24867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24805,5 +24875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24813,5 +24883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24821,5 +24891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24829,5 +24899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24837,5 +24907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24845,5 +24915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24853,5 +24923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24861,5 +24931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24869,5 +24939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24877,5 +24947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24885,5 +24955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24893,5 +24963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24901,5 +24971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24909,5 +24979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24917,5 +24987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24925,5 +24995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24933,5 +25003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24941,5 +25011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24949,5 +25019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24957,5 +25027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24965,5 +25035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24973,5 +25043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24981,5 +25051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24989,5 +25059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24997,5 +25067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25005,5 +25075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25013,5 +25083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25021,5 +25091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25029,5 +25099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25037,5 +25107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25045,5 +25115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25053,5 +25123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25061,5 +25131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25069,5 +25139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25077,5 +25147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25085,5 +25155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26789,7 +26859,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26799,5 +26869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26807,5 +26877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26815,5 +26885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26823,5 +26893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26831,5 +26901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26839,5 +26909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26847,5 +26917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26855,5 +26925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28276,5 +28346,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28290,5 +28360,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28298,5 +28368,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28307,5 +28377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28318,7 +28388,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28328,5 +28398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28336,5 +28406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28344,5 +28414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28352,5 +28422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28384,5 +28454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28398,5 +28468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28406,5 +28476,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28413,5 +28483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28421,5 +28491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28430,5 +28500,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28453,5 +28523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28566,9 +28636,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
@@ -28576,5 +28646,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,
@@ -28584,8 +28654,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
@@ -28599,5 +28669,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28605,5 +28675,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28652,6 +28722,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>
@@ -28731,5 +28801,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28739,11 +28809,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28759,5 +28829,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28766,5 +28836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28773,5 +28843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28787,5 +28857,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28799,5 +28869,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28806,5 +28876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28813,5 +28883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28820,5 +28890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28827,5 +28897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28834,5 +28904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28841,5 +28911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28848,5 +28918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28855,5 +28925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28862,5 +28932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28869,5 +28939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28876,5 +28946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28883,5 +28953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28890,5 +28960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28897,5 +28967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29072,7 +29142,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29086,5 +29156,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29094,7 +29164,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29104,5 +29174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29112,5 +29182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29120,5 +29190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29128,5 +29198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29142,5 +29212,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29149,5 +29219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29157,5 +29227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29164,5 +29234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29171,5 +29241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29178,5 +29248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29185,5 +29255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29192,5 +29262,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29199,5 +29269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29206,5 +29276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29213,5 +29283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29220,5 +29290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29232,5 +29302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29244,5 +29314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29251,5 +29321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29263,5 +29333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29276,5 +29346,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29289,5 +29359,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29301,5 +29371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29313,5 +29383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29320,5 +29390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29327,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29335,5 +29405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29342,5 +29412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29349,5 +29419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29356,5 +29426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29364,5 +29434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29373,5 +29443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29381,7 +29451,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29391,5 +29461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29399,5 +29469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29407,5 +29477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29416,5 +29486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29423,5 +29493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29431,5 +29501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29439,5 +29509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29447,5 +29517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29455,5 +29525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29463,5 +29533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29471,5 +29541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29479,5 +29549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29487,5 +29557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29495,5 +29565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29516,5 +29586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29529,7 +29599,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29539,5 +29609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29546,5 +29616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29554,5 +29624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29561,5 +29631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29569,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29577,5 +29647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29591,5 +29661,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29600,5 +29670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29617,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29625,5 +29695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29636,5 +29706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29653,5 +29723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29660,5 +29730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29667,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29674,7 +29744,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29685,5 +29755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29698,5 +29768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29710,5 +29780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29718,5 +29788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29730,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29742,5 +29812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29749,5 +29819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29756,7 +29826,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29766,5 +29836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29774,5 +29844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29782,5 +29852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29790,5 +29860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29798,5 +29868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29812,7 +29882,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29827,5 +29897,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29840,5 +29910,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29853,5 +29923,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29866,5 +29936,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29879,5 +29949,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29892,7 +29962,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29902,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29909,5 +29979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29917,5 +29987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29925,5 +29995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29933,5 +30003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29941,5 +30011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29949,5 +30019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29957,5 +30027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29965,5 +30035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29973,5 +30043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29981,5 +30051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29989,5 +30059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29997,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30015,5 +30085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30028,5 +30098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30039,7 +30109,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30049,5 +30119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30057,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30065,5 +30135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30073,5 +30143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30081,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30089,5 +30159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30097,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30105,5 +30175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30113,5 +30183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30121,5 +30191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30129,5 +30199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30137,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30145,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30153,5 +30223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30161,5 +30231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30169,5 +30239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30189,5 +30259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30201,7 +30271,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30211,5 +30281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30219,5 +30289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30227,5 +30297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30235,5 +30305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30243,5 +30313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30251,5 +30321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30259,5 +30329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30267,5 +30337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30275,5 +30345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30283,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30300,5 +30370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30308,5 +30378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30316,5 +30386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30324,5 +30394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30332,5 +30402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30340,5 +30410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30348,5 +30418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30356,5 +30426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30364,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30372,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30380,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30388,5 +30458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30405,5 +30475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30412,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30420,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30427,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30435,5 +30505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30443,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30451,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30458,5 +30528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30466,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30474,5 +30544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30482,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30490,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30497,5 +30567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30504,5 +30574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30511,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30518,5 +30588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30525,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30532,5 +30602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30539,5 +30609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30546,5 +30616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30553,5 +30623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30560,5 +30630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30567,5 +30637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30574,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30581,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30589,5 +30659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30597,5 +30667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30605,5 +30675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30613,5 +30683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30621,5 +30691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30629,5 +30699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30637,5 +30707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30645,5 +30715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30653,5 +30723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30662,5 +30732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30670,5 +30740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30678,5 +30748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30686,5 +30756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30694,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30702,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30710,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30718,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30726,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30734,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30742,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30750,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30758,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30766,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30774,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30782,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30790,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30798,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30806,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30814,5 +30884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30821,5 +30891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30851,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30859,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30867,7 +30937,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30882,5 +30952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30890,5 +30960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30898,5 +30968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30906,5 +30976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30914,5 +30984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30922,5 +30992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30930,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30944,7 +31014,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30954,5 +31024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30962,5 +31032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30970,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30978,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30986,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30994,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31002,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31010,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31018,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31026,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31034,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31042,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31050,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31058,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31066,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31074,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31082,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31090,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31098,5 +31168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31106,5 +31176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31114,5 +31184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31122,5 +31192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31130,5 +31200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31138,5 +31208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31146,5 +31216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31154,5 +31224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31162,5 +31232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31170,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31178,5 +31248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31186,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31194,5 +31264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31202,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31210,5 +31280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31218,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31226,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31234,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31242,5 +31312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31250,5 +31320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31258,5 +31328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31266,5 +31336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31274,5 +31344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31282,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31316,7 +31386,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31326,5 +31396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31334,5 +31404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31342,5 +31412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31350,5 +31420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31358,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31366,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31374,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31389,5 +31459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31397,5 +31467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31405,5 +31475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31413,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31421,5 +31491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31429,5 +31499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31438,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31446,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31454,5 +31524,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31462,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31469,5 +31539,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31476,5 +31546,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31492,7 +31562,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31502,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31510,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31518,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31526,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31534,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31542,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31550,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31558,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31566,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31582,5 +31652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31594,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31606,5 +31676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31614,5 +31684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31626,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31638,6 +31708,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31647,5 +31717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31659,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31671,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31683,5 +31753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31695,5 +31765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31707,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31715,7 +31785,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31725,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31733,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31741,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31749,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31764,5 +31834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31775,5 +31845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31787,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31799,5 +31869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31811,5 +31881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31820,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31828,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31836,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31844,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31852,5 +31922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31867,5 +31937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31879,5 +31949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31891,5 +31961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31903,5 +31973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31915,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31928,5 +31998,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?
@@ -31952,5 +32022,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31961,11 +32031,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31975,5 +32045,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31983,5 +32053,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31991,5 +32061,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31999,5 +32069,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32007,5 +32077,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32015,5 +32085,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32023,5 +32093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32031,5 +32101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32039,5 +32109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32047,5 +32117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32055,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32063,5 +32133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32081,5 +32151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32174,5 +32244,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32180,28 +32250,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
@@ -32316,5 +32386,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32327,5 +32397,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>
@@ -32350,6 +32420,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32358,6 +32428,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32372,6 +32442,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
@@ -32385,6 +32455,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
@@ -32404,6 +32474,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32427,6 +32497,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
@@ -32471,4 +32541,5 @@
 #~ 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."
@@ -32477,4 +32548,5 @@
 #~ 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}"
@@ -32498,4 +32570,5 @@
 #~ msgstr "Openen in browser"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Maak een melding bij {0}"
@@ -32503,13 +32576,12 @@
 #~ 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:"
@@ -32520,6 +32592,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."
@@ -32553,7 +32625,9 @@
 #~ 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}"
@@ -32563,12 +32637,11 @@
 #~ "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"
@@ -32609,6 +32682,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 "
@@ -32624,4 +32697,5 @@
 #~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Afbeeldingen van {0}"
@@ -32670,6 +32744,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32680,4 +32753,5 @@
 #~ msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32689,4 +32763,5 @@
 #~ "{0}"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kan plugin niet downloaden: {0} van {1}"
@@ -32704,4 +32779,5 @@
 #~ msgstr "EPSG:4326"
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Ontleedfout in URL: \"{0}\""
@@ -32714,6 +32790,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 "
@@ -32721,9 +32797,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?"
@@ -32736,10 +32812,11 @@
 #~ 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"
@@ -32758,4 +32835,5 @@
 #~ msgstr "Naar OSM uploaden..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32764,6 +32842,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}"
@@ -32772,19 +32850,25 @@
 #~ 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 "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Niet-weg \"{0}\" in multipolygoon."
@@ -32805,4 +32889,5 @@
 #~ msgstr "update aanvragen is mislukt"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} binnen de track."
@@ -32817,4 +32902,5 @@
 #~ msgstr "Afbeeldings-id Metacarta Map Rectifier"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier-id={0}"
@@ -32825,6 +32911,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 "
@@ -32841,6 +32927,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"
@@ -32849,9 +32935,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"
@@ -32865,13 +32951,14 @@
 #~ "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."
-
+#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij twijfel: "
+#~ "niet gebruiken."
+
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Kan niet lezen van URL: \"{0}\""
@@ -32908,6 +32995,5 @@
 #~ "<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"
@@ -32948,7 +33034,9 @@
 #~ "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}"
@@ -32961,7 +33049,6 @@
 #~ "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."
@@ -32971,4 +33058,5 @@
 #~ msgstr "Bronnen tagvoorkeuzen"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan voorkeurenmap niet openen: {0}"
@@ -33029,4 +33117,5 @@
 #~ "over dit probleem."
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
@@ -33035,22 +33124,23 @@
 #~ 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?"
@@ -33069,4 +33159,5 @@
 #~ msgstr "E-mail"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Verbinden met {0}..."
@@ -33084,10 +33175,13 @@
 #~ 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"
@@ -33100,16 +33194,19 @@
 
 #~ 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"
@@ -33118,9 +33215,14 @@
 #~ 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}\"."
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
 
 #~ msgid ""
@@ -33129,7 +33231,9 @@
 #~ "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:"
@@ -33152,9 +33256,8 @@
 #~ msgstr "Hulp / Over"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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?"
@@ -33196,4 +33299,5 @@
 #~ 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"
@@ -33257,17 +33361,19 @@
 
 #~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
+#~ "A special handler of the french cadastre wms at "
+#~ "www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+#~ "(in french): <br><a "
+#~ "href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+#~ "l\"> "
+#~ "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+#~ "<BR>before any upload of data created by this plugin."
 #~ msgstr ""
-#~ "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."
+#~ "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."
 
 #~ msgid "sports"
@@ -33283,4 +33389,5 @@
 #~ msgstr "Omlaag bewegen"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relatie-editor: {0}"
@@ -33305,14 +33412,15 @@
 #~ 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}."
@@ -33331,4 +33439,5 @@
 #~ "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}"
@@ -33338,6 +33447,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 "
@@ -33345,9 +33454,11 @@
 
 #~ 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"
+#~ msgstr "Fouten tijdens download"
 
 #~ msgid "Edit Track of grade 1"
@@ -33378,4 +33489,5 @@
 #~ msgstr "Valhek bewerken"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33399,10 +33511,11 @@
 #~ 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"
@@ -33418,7 +33531,9 @@
 #~ 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"
@@ -33427,14 +33542,16 @@
 #~ 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"
 #~ msgstr "Upload naar OSM API gefaald"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' mag niet null zijn"
@@ -33449,7 +33566,9 @@
 #~ 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}\"."
@@ -33458,4 +33577,5 @@
 #~ msgstr "Aanpassen primitief"
 
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Versturen van {0} objecten ..."
@@ -33464,24 +33584,26 @@
 #~ 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 "
@@ -33491,7 +33613,9 @@
 #~ 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 "
@@ -33501,4 +33625,9 @@
 #~ "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 21602)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:23+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-06 13:15+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-02 08:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -92,5 +92,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -267,6 +267,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -321,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 ""
 "<html>Nie ma warstw, z którymi można by połączyć warstwę "
@@ -346,9 +346,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
@@ -439,6 +439,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -654,12 +654,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -782,5 +782,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "Wprowadzono niepoprawne ID. Nie można pobrać obiektu."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -915,5 +915,6 @@
 #, 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
@@ -1182,18 +1183,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
 msgid "Move Node..."
-msgstr ""
+msgstr "Przesuń węzeł..."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
 msgid "Edit latitude and longitude of a node."
-msgstr ""
+msgstr "Edytuje szerokość i długość geograficzną węzła."
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 msgid "New Layer"
-msgstr ""
+msgstr "Nowa warstwa"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map layer."
-msgstr ""
+msgstr "Tworzy nową warstwę mapy."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
@@ -1458,5 +1459,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1477,5 +1479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1625,5 +1627,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Pokazuje raport zawierający użyteczne informacje, które mogą być dołączone "
@@ -1647,5 +1650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1852,5 +1855,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden węzeł, który jest użyty przez więcej niż jedną drogę oraz jedną z "
@@ -1922,9 +1926,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)"
@@ -1941,5 +1945,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2231,7 +2235,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Błędy podczas pobierania"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Błędy w czasie pobierania"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2266,7 +2270,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Błędy w czasie pobierania"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2401,6 +2405,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 ""
 
@@ -2488,6 +2492,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
@@ -2527,70 +2531,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Wyszukuje obiekty."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Podaj ciąg do przefiltrowania."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Podaj ciąg do wyszukania."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Wpisz wyrażenie do wyszukania"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "zamień zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "dodaj do zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "usuń z zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "znajdź w zaznaczeniu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "uwzględnij wielkość liter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "wyrażenie regularne"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - ''Baker'' oraz ''Street'' w dowolnym kluczu lub nazwie."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - ''Baker Street'' w dowolnym kluczu lub nazwie."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' gdziekolwiek w nazwie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2598,21 +2602,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - klucz=foot ustawiony na dowolną wartość"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2620,17 +2624,17 @@
 "<b>type:</b> - rodzaj obiektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - wszystkie obiekty zmienione przez użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2638,5 +2642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2644,11 +2648,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2656,5 +2660,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2662,39 +2670,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - wszystkie zmienione obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - wszystkie zaznaczone obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - wszystkie niekompletne obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - wszystkie obiekty bez tagów"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Użyj <b>I</b> lub <b>OR</b> by połączyć logicznym \"lub\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2702,11 +2710,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Użyj <b>(</b> oraz <b>)</b> aby pogrupować wyrażenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2714,38 +2722,38 @@
 msgstr "Filtr"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Stwórz filtr"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Rozpocznij szukanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nie znaleziono nic szukając ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2753,5 +2761,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2759,5 +2767,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2765,5 +2773,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2778,50 +2786,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Brak parametru dla OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Brak parametru dla NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2888,5 +2899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3099,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 ""
 "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to spowodowac "
@@ -3380,6 +3391,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 "
@@ -3466,5 +3477,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3473,5 +3484,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3480,5 +3491,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3515,5 +3526,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3569,5 +3580,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3575,5 +3586,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3581,17 +3592,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Tekst"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "D"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3599,5 +3604,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3606,5 +3611,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3612,5 +3617,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3618,5 +3623,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3624,42 +3629,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtr aktywny</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> ukrytych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> wyłączonych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr "</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+msgstr ""
+"</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Oczekiwano ID > 0. Jest {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3668,5 +3674,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3674,5 +3680,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3731,5 +3737,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3739,81 +3746,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Nieznana rola \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Błąd: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3987,5 +3994,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -4057,5 +4065,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4065,5 +4073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4072,5 +4080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4079,5 +4087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4086,5 +4094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4093,5 +4101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4100,9 +4108,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4414,6 +4422,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4428,4 +4436,5 @@
 msgstr "Edycja"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4563,5 +4572,6 @@
 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
@@ -4574,6 +4584,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
@@ -4584,6 +4594,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
@@ -4625,5 +4635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4645,6 +4655,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
@@ -4664,6 +4674,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 "
@@ -4699,5 +4709,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"
@@ -4706,5 +4716,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"
@@ -4713,5 +4723,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"
@@ -4927,5 +4937,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4950,6 +4961,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4961,5 +4973,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "W dół"
@@ -5004,6 +5016,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 ""
 
@@ -5011,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 ""
 
@@ -5064,6 +5076,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 ""
 
@@ -5280,6 +5292,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5292,6 +5304,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5541,6 +5553,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
@@ -5556,6 +5568,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>"
 
@@ -5600,7 +5612,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 ""
 
@@ -5625,5 +5637,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5641,6 +5654,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5664,5 +5676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5670,5 +5682,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5741,9 +5753,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5761,13 +5774,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtruj obiekty i ukrywaj/blokuj je."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5776,45 +5789,41 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Dodaje filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Edytuje filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Usuwa filtr."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Przesuwa filtr do góry."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Przesuwa filtr na dół."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Zastosuj filtr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Ukryj elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Zastosuj także dla dzieci"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Odwróć filtr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Tryb filtru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6041,10 +6050,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6388,4 +6397,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7499,6 +7509,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 ""
 
@@ -7522,8 +7532,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 ""
 
@@ -7643,5 +7653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7651,23 +7661,23 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Pusta wartość usunie znacznik."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7677,5 +7687,5 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7685,77 +7695,81 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Zaznacz obiekty, których właściwości chcesz zmienić."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Właściwości/członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Członek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7870,6 +7884,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 ""
 
@@ -7887,6 +7901,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 ""
 
@@ -8041,6 +8055,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8233,6 +8248,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
@@ -8377,6 +8392,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8436,4 +8452,5 @@
 msgstr "Odpytywanie serwera nazw…"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8516,6 +8533,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 ""
 
@@ -8525,6 +8542,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 ""
 
@@ -8801,8 +8818,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8817,7 +8835,8 @@
 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 ""
 
@@ -9053,5 +9072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9068,5 +9087,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9152,6 +9172,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] ""
@@ -9165,6 +9185,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 "
@@ -9390,5 +9410,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9414,5 +9434,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9467,6 +9488,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 ""
 
@@ -9520,7 +9541,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 ""
 
@@ -9530,5 +9551,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9553,5 +9574,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9772,7 +9794,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 ""
 
@@ -9798,7 +9820,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 ""
 
@@ -9865,6 +9887,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane "
@@ -9880,5 +9902,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9931,6 +9953,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:1126
@@ -10054,6 +10076,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 ""
 
@@ -10117,7 +10139,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 ""
 
@@ -10184,64 +10206,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Strefa czasowa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10251,20 +10277,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10273,5 +10299,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10279,21 +10305,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10301,17 +10327,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10320,5 +10346,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10369,14 +10395,14 @@
 msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10385,5 +10411,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10392,10 +10418,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10404,5 +10430,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10692,6 +10718,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 ""
 
@@ -10713,8 +10739,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 ""
 
@@ -10834,6 +10860,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 ""
 
@@ -10943,5 +10969,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11075,8 +11102,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 ""
 
@@ -11159,8 +11186,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 ""
 
@@ -11187,7 +11214,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 ""
 
@@ -11202,5 +11229,6 @@
 #: ../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
@@ -11260,34 +11288,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Nazwane punkty tras."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11295,5 +11319,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11301,21 +11325,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11323,5 +11341,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11329,5 +11347,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11335,17 +11353,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11353,13 +11371,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Czas rozbiegu (w sekundach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Kalibracja urządzenia nagrywającego"
@@ -11399,5 +11417,5 @@
 msgstr "Kolory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11408,34 +11426,35 @@
 msgstr "wszystkie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "pliki lokalne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "żadne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Wymuszaj rysowanie linii jeżeli nie zaimportowano odcinków."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Rysuj duże punkty GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Prędkość (czerwony = wolno, zielony = szybko)"
 
+#: ../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)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11443,5 +11462,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11463,5 +11482,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11503,5 +11522,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11515,50 +11534,60 @@
 msgstr "Ruch pieszy"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Rysuj strzałki kierunkowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Tylko na początku drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Numeruj kolejne segmenty dróg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Rysuj granicę obszaru pobranych danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11568,9 +11597,9 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maksymalna długość dla plików lokalnych (w metrach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11579,10 +11608,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maksymalna długość (w metrach)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11591,11 +11620,12 @@
 "liniach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Rysuje strzałki kierunkowe korzystając z przygotowanych wartości zamiast "
@@ -11603,5 +11633,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11609,13 +11639,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Rysuj większe kropki dla punktów GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11623,9 +11653,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11633,47 +11663,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Punkty GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Dane OSM"
@@ -11745,8 +11776,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] "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>:"
@@ -11759,5 +11792,6 @@
 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>:"
@@ -11798,6 +11832,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Aktualizuj wtyczki"
@@ -11876,6 +11910,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 ""
 
@@ -11888,9 +11922,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 ""
 
@@ -12189,6 +12223,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 ""
 
@@ -12310,6 +12344,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 ""
 
@@ -12331,6 +12365,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 ""
 
@@ -12409,5 +12443,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12423,5 +12458,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12515,6 +12551,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 ""
 
@@ -12811,5 +12847,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
@@ -12994,5 +13030,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13377,9 +13414,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
@@ -13406,6 +13443,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 ""
 
@@ -13447,5 +13484,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13880,14 +13918,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13896,23 +13939,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13920,5 +13958,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13926,17 +13964,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13944,5 +13982,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13954,42 +13992,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Zablokuj wtyczkę"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13998,5 +14036,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14005,23 +14043,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę "
+"\"{0}\"."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę \"{0}"
-"\"."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14030,9 +14068,9 @@
 "błędu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Czy ta wtyczka ma zostać zablokowana?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14042,14 +14080,14 @@
 "JOSM , aby wyładować wtyczkę."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Informacje o wtyczce"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "brak opisu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14092,5 +14130,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14152,5 +14191,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"
@@ -14233,6 +14272,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 ""
 
@@ -14240,7 +14279,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 ""
 
@@ -14248,7 +14287,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 ""
 
@@ -14256,8 +14295,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 ""
 
@@ -14277,7 +14316,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 ""
 
@@ -14346,6 +14385,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14357,7 +14397,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 ""
 
@@ -14389,9 +14429,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14683,5 +14723,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Alphabetic"
-msgstr ""
+msgstr "Alfabetycznie"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
@@ -14795,5 +14835,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
 msgid "Alphabetic address must end with a letter"
-msgstr ""
+msgstr "Adresy alfabetyczne muszą kończyć się literą"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
@@ -15055,7 +15095,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15065,5 +15105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15073,5 +15113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15087,5 +15127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15095,5 +15135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15124,5 +15164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15131,5 +15171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15138,5 +15178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15145,5 +15185,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15152,5 +15192,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15159,5 +15199,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15191,10 +15231,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15216,5 +15257,6 @@
 "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
@@ -15580,5 +15622,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
 msgid "Add new layer"
-msgstr ""
+msgstr "Dodaj nową warstwę"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
@@ -15668,34 +15710,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Użyj"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Wybierz schemat do użycia."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Schemat kolorów"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Wybierz proszę schemat do usunięcia."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Schematy kolorów"
@@ -15768,5 +15811,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15857,4 +15900,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16064,5 +16108,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16183,5 +16227,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16200,6 +16245,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16507,5 +16553,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -16617,5 +16664,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16668,5 +16716,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17482,4 +17531,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17924,6 +17981,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
 msgid ""
-"Development of the turn restriction plugin was sponsored by <a href=\"http://"
-"www.skobbler.de\">skobbler GmbH</a>."
+"Development of the turn restriction plugin was sponsored by <a "
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
 
@@ -18009,8 +18066,8 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
-"a turn restriction, the way with role <tt>from</tt> should be different from "
-"the way with role <tt>to</tt>, though."
+"This turn restriction uses the OSM way <span class=\"object-"
+"name\">{0}</span> with role <tt>from</tt> <strong>and</strong> with role "
+"<tt>to</tt>. In a turn restriction, the way with role <tt>from</tt> should "
+"be different from the way with role <tt>to</tt>, though."
 msgstr ""
 
@@ -18064,8 +18121,8 @@
 "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
 "<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
-"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
-"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
-"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
-"object."
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-"
+"name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It is "
+"recommended to set <span class=\"object-name\">{2}</span> as unique "
+"<strong>via</strong>-object."
 msgstr ""
 
@@ -18177,6 +18234,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18184,6 +18241,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18822,6 +18879,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18968,5 +19026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19067,5 +19125,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19442,9 +19500,6 @@
 msgstr "Pliki WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19453,10 +19508,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Baza danych offline w celach konserwacyjnych"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19464,25 +19519,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19490,17 +19545,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "las"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19508,7 +19563,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19518,5 +19573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19559,5 +19614,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19567,5 +19622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19575,5 +19630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19583,8 +19638,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19598,5 +19653,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19607,5 +19662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19614,7 +19669,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19624,5 +19679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19632,5 +19687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19640,5 +19695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19648,5 +19703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19656,5 +19711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19664,5 +19719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19672,8 +19727,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19683,59 +19738,60 @@
 msgstr "droga"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Dodatkowe atrybuty:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "brak modyfikatora"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nazwa pliku"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "przełaz"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Rodzaje paliwa:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Strona domowa"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoizm"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Powiększ"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nowa rola"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Utwórz nowy węzeł."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Zapisz"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19806,5 +19862,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19970,6 +20027,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19978,5 +20042,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19985,10 +20049,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19997,5 +20061,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20005,5 +20069,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20014,15 +20078,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20031,5 +20095,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20557,5 +20621,5 @@
 #: build/trans_presets.java:587 build/trans_presets.java:605
 msgid "Passing Places"
-msgstr ""
+msgstr "zatoki dla wymijania"
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -20657,5 +20721,5 @@
 #: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "paved"
-msgstr ""
+msgstr "utwardzona"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20668,5 +20732,5 @@
 #: build/trans_presets.java:1254
 msgid "unpaved"
-msgstr ""
+msgstr "nieutwardzona"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20679,5 +20743,5 @@
 #: build/trans_presets.java:1254
 msgid "asphalt"
-msgstr ""
+msgstr "asfalt"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20690,5 +20754,5 @@
 #: build/trans_presets.java:619 build/trans_presets.java:1254
 msgid "concrete"
-msgstr ""
+msgstr "beton"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20701,5 +20765,5 @@
 #: build/trans_presets.java:1254 build/trans_presets.java:2493
 msgid "metal"
-msgstr ""
+msgstr "metal"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20712,5 +20776,5 @@
 #: build/trans_presets.java:1254 build/trans_presets.java:2493
 msgid "wood"
-msgstr "Las naturalny"
+msgstr "drewno"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20723,5 +20787,5 @@
 #: build/trans_presets.java:1254
 msgid "paving_stones"
-msgstr ""
+msgstr "kostka"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20756,5 +20820,5 @@
 #: build/trans_presets.java:1254
 msgid "pebblestone"
-msgstr ""
+msgstr "kamienie"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20767,5 +20831,5 @@
 #: build/trans_presets.java:1254
 msgid "compacted"
-msgstr ""
+msgstr "szuter"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20778,5 +20842,5 @@
 #: build/trans_presets.java:1254
 msgid "grass_paver"
-msgstr ""
+msgstr "kratka trawnikowa"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -20858,10 +20922,10 @@
 #: build/trans_presets.java:311
 msgid "Serviceway type"
-msgstr ""
+msgstr "Rodzaj"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:311
 msgid "alley"
-msgstr "Alejka"
+msgstr "alejka"
 
 #: build/trans_presets.java:311
@@ -20919,7 +20983,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21059,8 +21123,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"/>
@@ -21270,5 +21334,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21278,5 +21342,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21295,5 +21359,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21303,5 +21367,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21320,5 +21384,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21328,5 +21392,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21345,5 +21409,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21353,5 +21417,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21366,5 +21430,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21382,5 +21446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21398,5 +21462,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21405,5 +21469,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21413,5 +21477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21431,5 +21495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21438,5 +21502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21446,5 +21510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21905,5 +21969,5 @@
 #: build/trans_presets.java:682
 msgid "Edit Passing Place"
-msgstr "Edycja zatoku"
+msgstr "Edycja zatoki"
 
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
@@ -22148,5 +22212,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22197,5 +22261,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22292,5 +22356,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22458,5 +22522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22790,5 +22854,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22798,5 +22862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22806,5 +22870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22814,5 +22878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22822,5 +22886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22830,5 +22894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22838,5 +22902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22847,5 +22911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23712,5 +23776,5 @@
 #: build/trans_presets.java:1471 build/trans_presets.java:2451
 msgid "Wheelchair"
-msgstr "dla niepełnosprawnych"
+msgstr "Dla niepełnosprawnych"
 
 #. item "Public Transport/Subway Entrance" check "Bicycle"
@@ -24265,5 +24329,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24273,5 +24337,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24281,5 +24345,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24289,5 +24353,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24608,5 +24672,5 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:2722
 msgid "Sports"
-msgstr "sklep sportowy"
+msgstr "Sport"
 
 #. group "Sports"
@@ -24651,7 +24715,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24661,5 +24725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24669,5 +24733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24677,5 +24741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24685,5 +24749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24693,5 +24757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24701,5 +24765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24709,5 +24773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24717,5 +24781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24725,5 +24789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24733,5 +24797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24741,5 +24805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24749,5 +24813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24757,5 +24821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24765,5 +24829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24773,5 +24837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24781,5 +24845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24789,5 +24853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24797,5 +24861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24805,5 +24869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24813,5 +24877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24821,5 +24885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24829,5 +24893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24837,5 +24901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24845,5 +24909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24853,5 +24917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24861,5 +24925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24869,5 +24933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24877,5 +24941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24885,5 +24949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24893,5 +24957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24901,5 +24965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24909,5 +24973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24917,5 +24981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24925,5 +24989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24933,5 +24997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24941,5 +25005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24949,5 +25013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24957,5 +25021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24965,5 +25029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24973,5 +25037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24981,5 +25045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24989,5 +25053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24997,5 +25061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25005,5 +25069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25013,5 +25077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25021,5 +25085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26220,5 +26284,5 @@
 #: build/trans_presets.java:2311
 msgid "alphabetic"
-msgstr ""
+msgstr "alfabetycznie"
 
 #: build/trans_presets.java:2314
@@ -26322,33 +26386,33 @@
 #: build/trans_presets.java:2358 build/trans_presets.java:2401
 msgid "gas"
-msgstr "gazowa"
+msgstr "gazowy"
 
 #: build/trans_presets.java:2358
 msgid "heat"
-msgstr ""
+msgstr "ciepłowniczy"
 
 #: build/trans_presets.java:2358
 msgid "oil"
-msgstr ""
+msgstr "naftowy"
 
 #: build/trans_presets.java:2358
 msgid "sewage"
-msgstr ""
+msgstr "ściekowy"
 
 #: build/trans_presets.java:2358
 msgid "any substance"
-msgstr ""
+msgstr "różne substancje"
 
 #: build/trans_presets.java:2359
 msgid "Location"
-msgstr ""
+msgstr "Położenie"
 
 #: build/trans_presets.java:2359
 msgid "underwater"
-msgstr ""
+msgstr "podwodny"
 
 #: build/trans_presets.java:2359
 msgid "overground"
-msgstr ""
+msgstr "nadziemy"
 
 #: build/trans_presets.java:2361
@@ -26406,18 +26470,18 @@
 #: build/trans_presets.java:2392
 msgid "indoor"
-msgstr ""
+msgstr "wewnętrzny"
 
 #: build/trans_presets.java:2392
 msgid "outdoor"
-msgstr ""
+msgstr "zewnętrzny"
 
 #: build/trans_presets.java:2392
 msgid "public"
-msgstr ""
+msgstr "publiczny"
 
 #. <separator/>
 #: build/trans_presets.java:2395
 msgid "Power Generator"
-msgstr "źródło energii elektrycznej"
+msgstr "elektrownia"
 
 #. item "Man Made/Power Generator"
@@ -26427,5 +26491,5 @@
 #: build/trans_presets.java:2399
 msgid "Edit Power Generator"
-msgstr "Edycja źródła energii elektrycznej"
+msgstr "Edycja elektowni"
 
 #. item "Man Made/Power Generator" combo "Type"
@@ -26457,5 +26521,5 @@
 #: build/trans_presets.java:2404
 msgid "Power Station"
-msgstr "elektrownia"
+msgstr "rozdzielnia elektryczna"
 
 #. item "Man Made/Power Station"
@@ -26464,10 +26528,10 @@
 #: build/trans_presets.java:2407
 msgid "Edit Power Station"
-msgstr "Edycja elektrowni"
+msgstr "Edycja rozdzielni elektrycznej"
 
 #. item "Man Made/Power Station" text "Reference"
 #: build/trans_presets.java:2413
 msgid "Power Sub Station"
-msgstr "rozdzielnia elektryczna"
+msgstr "stacja transformatorowa"
 
 #. item "Man Made/Power Sub Station"
@@ -26476,5 +26540,5 @@
 #: build/trans_presets.java:2416
 msgid "Edit Power Sub Station"
-msgstr "Edycja rozdzielni elektrycznej"
+msgstr "Edycja stacji transformatorowej"
 
 #. item "Man Made/Power Sub Station" text "Operator"
@@ -26496,18 +26560,18 @@
 #: build/trans_presets.java:2426
 msgid "Edit Power Tower"
-msgstr "Edycja słupa linii wysokiego napięcia"
+msgstr "Edycja słupa elektrycznego"
 
 #. item "Man Made/Power Tower" combo "Type"
 #: build/trans_presets.java:2427
 msgid "tower"
-msgstr ""
+msgstr "wieża"
 
 #: build/trans_presets.java:2427
 msgid "pole"
-msgstr ""
+msgstr "słup"
 
 #: build/trans_presets.java:2428
 msgid "Tower reference"
-msgstr ""
+msgstr "Numer referencyjny"
 
 #. item "Man Made/Power Tower" text "Tower reference"
@@ -26526,45 +26590,45 @@
 #: build/trans_presets.java:2434
 msgid "Line type"
-msgstr ""
+msgstr "Rodzaj linii"
 
 #. item "Man Made/Power Line" combo "Line type"
 #: build/trans_presets.java:2434
 msgid "line"
-msgstr ""
+msgstr "linia główna"
 
 #: build/trans_presets.java:2434
 msgid "minor_line"
-msgstr ""
+msgstr "linia boczna"
 
 #. item "Man Made/Power Line" combo "Voltage"
 #: build/trans_presets.java:2439
 msgid "Amount of Cables"
-msgstr ""
+msgstr "Liczba kabli"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
 #: build/trans_presets.java:2440
 msgid "Number of wires (better: conductors) per power cable"
-msgstr ""
+msgstr "Liczba przewodów w jednym kablu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
 #: build/trans_presets.java:2440
 msgid "single"
-msgstr ""
+msgstr "pojedynczy"
 
 #: build/trans_presets.java:2440
 msgid "double"
-msgstr ""
+msgstr "podwójny"
 
 #: build/trans_presets.java:2440
 msgid "triple"
-msgstr ""
+msgstr "potrójny"
 
 #: build/trans_presets.java:2440
 msgid "quad"
-msgstr ""
+msgstr "poczwórny"
 
 #: build/trans_presets.java:2443
 msgid "Amenities"
-msgstr "udogodnienia (amenities)"
+msgstr "Udogodnienia"
 
 #. group "Amenities"
@@ -26575,5 +26639,5 @@
 #: build/trans_presets.java:2451
 msgid "limited"
-msgstr ""
+msgstr "limitowane"
 
 #. item "Shops/Vending machine" text "Reference number"
@@ -26693,9 +26757,9 @@
 #: build/trans_presets.java:2492
 msgid "Backrest"
-msgstr ""
+msgstr "Oparcie"
 
 #: build/trans_presets.java:2493
 msgid "Material"
-msgstr ""
+msgstr "Materiał"
 
 #. item "Amenities/Bench" combo "Material"
@@ -26706,18 +26770,18 @@
 #: build/trans_presets.java:2493
 msgid "plastic"
-msgstr ""
+msgstr "plastik"
 
 #: build/trans_presets.java:2494
 msgid "Colour"
-msgstr ""
+msgstr "Kolor"
 
 #. item "Amenities/Bench" combo "Colour"
 #: build/trans_presets.java:2494
 msgid "black"
-msgstr ""
+msgstr "czarny"
 
 #: build/trans_presets.java:2494
 msgid "brown"
-msgstr ""
+msgstr "brązowy"
 
 #. color historic
@@ -26725,7 +26789,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26735,5 +26799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26743,5 +26807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26751,5 +26815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26759,5 +26823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26767,5 +26831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26775,5 +26839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26783,5 +26847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26791,5 +26855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -26804,21 +26868,21 @@
 #: build/trans_presets.java:2494
 msgid "red"
-msgstr ""
+msgstr "czerwony"
 
 #: build/trans_presets.java:2494
 msgid "blue"
-msgstr ""
+msgstr "niebieski"
 
 #: build/trans_presets.java:2494
 msgid "gray"
-msgstr ""
+msgstr "szary"
 
 #: build/trans_presets.java:2494
 msgid "white"
-msgstr ""
+msgstr "biały"
 
 #: build/trans_presets.java:2495
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Pojemność"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
@@ -26842,13 +26906,13 @@
 #: build/trans_presets.java:2500
 msgid "low"
-msgstr ""
+msgstr "niska"
 
 #: build/trans_presets.java:2500
 msgid "half"
-msgstr ""
+msgstr "połowiczna"
 
 #: build/trans_presets.java:2500
 msgid "full"
-msgstr ""
+msgstr "pełna"
 
 #: build/trans_presets.java:2502
@@ -26899,5 +26963,5 @@
 #: build/trans_presets.java:2525
 msgid "Baby Hatch"
-msgstr ""
+msgstr "okno życia"
 
 #. item "Amenities/Baby Hatch"
@@ -26905,5 +26969,5 @@
 #: build/trans_presets.java:2527
 msgid "Edit Baby Hatch"
-msgstr ""
+msgstr "Edycja okna życia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
@@ -27905,5 +27969,5 @@
 #: build/trans_presets.java:3093
 msgid "Recreation Ground"
-msgstr "Teren rekreacyjny"
+msgstr "teren rekreacyjny"
 
 #. item "Land use/Recreation Ground"
@@ -28009,10 +28073,10 @@
 #: build/trans_presets.java:3162
 msgid "Brownfield"
-msgstr ""
+msgstr "teren poprzemysłowy"
 
 #. item "Land use/Brownfield"
 #: build/trans_presets.java:3163
 msgid "Edit Brownfield Landuse"
-msgstr ""
+msgstr "Edycja terenu poprzemysłowego"
 
 #. item "Land use/Brownfield" text "Name"
@@ -28212,5 +28276,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28226,5 +28290,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28234,5 +28298,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28243,5 +28307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28254,7 +28318,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28264,5 +28328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28272,5 +28336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28280,5 +28344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28288,5 +28352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28320,5 +28384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28334,5 +28398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28342,5 +28406,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28349,5 +28413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28357,5 +28421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28366,5 +28430,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28389,5 +28453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28502,9 +28566,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
@@ -28512,5 +28576,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,
@@ -28520,8 +28584,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
@@ -28535,5 +28599,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28541,5 +28605,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28588,6 +28652,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>
@@ -28667,5 +28731,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28675,11 +28739,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28695,5 +28759,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28702,5 +28766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28709,5 +28773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28723,5 +28787,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28735,5 +28799,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28742,5 +28806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28749,5 +28813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28756,5 +28820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28763,5 +28827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28770,5 +28834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28777,5 +28841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28784,5 +28848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28791,5 +28855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28798,5 +28862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28805,5 +28869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28812,5 +28876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28819,5 +28883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28826,5 +28890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28833,5 +28897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29008,7 +29072,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29022,5 +29086,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29030,7 +29094,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29040,5 +29104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29048,5 +29112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29056,5 +29120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29064,5 +29128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29078,5 +29142,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29085,5 +29149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29093,5 +29157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29100,5 +29164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29107,5 +29171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29114,5 +29178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29121,5 +29185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29128,5 +29192,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29135,5 +29199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29142,5 +29206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29149,5 +29213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29156,5 +29220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29168,5 +29232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29180,5 +29244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29187,5 +29251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29199,5 +29263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29212,5 +29276,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29225,5 +29289,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29237,5 +29301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29249,5 +29313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29256,5 +29320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29263,5 +29327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29271,5 +29335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29278,5 +29342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29285,5 +29349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29292,5 +29356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29300,5 +29364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29309,5 +29373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29317,7 +29381,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29327,5 +29391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29335,5 +29399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29343,5 +29407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29352,5 +29416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29359,5 +29423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29367,5 +29431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29375,5 +29439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29383,5 +29447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29391,5 +29455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29399,5 +29463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29407,5 +29471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29415,5 +29479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29423,5 +29487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29431,5 +29495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29452,5 +29516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29465,7 +29529,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29475,5 +29539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29482,5 +29546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29490,5 +29554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29497,5 +29561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29505,5 +29569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29513,5 +29577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29527,5 +29591,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29536,5 +29600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29553,5 +29617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29561,5 +29625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29572,5 +29636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29589,5 +29653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29596,5 +29660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29603,5 +29667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29610,7 +29674,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29621,5 +29685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29634,5 +29698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29646,5 +29710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29654,5 +29718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29666,5 +29730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29678,5 +29742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29685,5 +29749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29692,7 +29756,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29702,5 +29766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29710,5 +29774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29718,5 +29782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29726,5 +29790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29734,5 +29798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29748,7 +29812,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29763,5 +29827,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29776,5 +29840,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29789,5 +29853,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29802,5 +29866,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29815,5 +29879,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29828,7 +29892,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29838,5 +29902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29845,5 +29909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29853,5 +29917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29861,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29869,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29877,5 +29941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29885,5 +29949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29893,5 +29957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29901,5 +29965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29909,5 +29973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29917,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29925,5 +29989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29933,5 +29997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29951,5 +30015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29964,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29975,7 +30039,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29985,5 +30049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29993,5 +30057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30001,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30009,5 +30073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30017,5 +30081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30025,5 +30089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30033,5 +30097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30041,5 +30105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30049,5 +30113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30057,5 +30121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30065,5 +30129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30073,5 +30137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30081,5 +30145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30089,5 +30153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30097,5 +30161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30105,5 +30169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30125,5 +30189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30137,7 +30201,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30147,5 +30211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30155,5 +30219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30163,5 +30227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30171,5 +30235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30179,5 +30243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30187,5 +30251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30195,5 +30259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30203,5 +30267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30211,5 +30275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30219,5 +30283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30236,5 +30300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30244,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30252,5 +30316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30260,5 +30324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30268,5 +30332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30276,5 +30340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30284,5 +30348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30292,5 +30356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30300,5 +30364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30308,5 +30372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30316,5 +30380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30324,5 +30388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30341,5 +30405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30348,5 +30412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30356,5 +30420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30363,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30371,5 +30435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30379,5 +30443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30387,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30394,5 +30458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30402,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30410,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30418,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30426,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30433,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30440,5 +30504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30447,5 +30511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30454,5 +30518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30461,5 +30525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30468,5 +30532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30475,5 +30539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30482,5 +30546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30489,5 +30553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30496,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30503,5 +30567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30510,5 +30574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30517,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30525,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30533,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30541,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30549,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30557,5 +30621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30565,5 +30629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30573,5 +30637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30581,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30589,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30598,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30606,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30614,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30622,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30630,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30638,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30646,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30654,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30662,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30670,5 +30734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30678,5 +30742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30686,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30694,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30702,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30710,5 +30774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30718,5 +30782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30726,5 +30790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30734,5 +30798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30742,5 +30806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30750,5 +30814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30757,5 +30821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30787,5 +30851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30795,5 +30859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30803,7 +30867,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30818,5 +30882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30826,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30834,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30842,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30850,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30858,5 +30922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30866,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30880,7 +30944,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30890,5 +30954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30898,5 +30962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30906,5 +30970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30914,5 +30978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30922,5 +30986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30930,5 +30994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30938,5 +31002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30946,5 +31010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30954,5 +31018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30962,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30970,5 +31034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30978,5 +31042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30986,5 +31050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30994,5 +31058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31002,5 +31066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31010,5 +31074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31018,5 +31082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31026,5 +31090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31034,5 +31098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31042,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31050,5 +31114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31058,5 +31122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31066,5 +31130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31074,5 +31138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31082,5 +31146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31090,5 +31154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31098,5 +31162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31106,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31114,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31122,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31130,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31138,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31146,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31154,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31162,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31170,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31178,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31186,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31194,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31202,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31210,5 +31274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31218,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31252,7 +31316,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31262,5 +31326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31270,5 +31334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31278,5 +31342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31286,5 +31350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31294,5 +31358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31302,5 +31366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31310,5 +31374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31325,5 +31389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31333,5 +31397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31341,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31349,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31357,5 +31421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31365,5 +31429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31374,5 +31438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31382,5 +31446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31390,5 +31454,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31398,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31405,5 +31469,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31412,5 +31476,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31428,7 +31492,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31438,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31446,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31454,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31462,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31470,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31478,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31486,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31494,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31502,5 +31566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31518,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31530,5 +31594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31542,5 +31606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31550,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31562,5 +31626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31574,6 +31638,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31583,5 +31647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31595,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31607,10 +31671,10 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
 #: build/trans_style.java:3293
 msgid "brownfield"
-msgstr ""
+msgstr "teren poprzemysłowy"
 
 #. color brownfield
@@ -31619,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31631,5 +31695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31643,5 +31707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31651,7 +31715,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31661,5 +31725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31669,5 +31733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31677,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31685,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31700,5 +31764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31711,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31723,5 +31787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31735,5 +31799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31747,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31756,5 +31820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31764,5 +31828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31772,5 +31836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31780,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31788,5 +31852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31803,5 +31867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31815,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31827,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31839,5 +31903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31851,5 +31915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31864,5 +31928,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?
@@ -31888,5 +31952,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31897,11 +31961,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31911,5 +31975,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31919,5 +31983,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31927,5 +31991,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31935,5 +31999,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31943,5 +32007,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31951,5 +32015,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31959,5 +32023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31967,5 +32031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31975,5 +32039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31983,5 +32047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31991,5 +32055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31999,5 +32063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32017,5 +32081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32110,5 +32174,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32116,28 +32180,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
@@ -32252,5 +32316,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32263,5 +32327,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>
@@ -32286,6 +32350,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32294,6 +32358,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32308,6 +32372,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
@@ -32321,6 +32385,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
@@ -32340,6 +32404,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32363,6 +32427,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
@@ -32390,4 +32454,5 @@
 #~ msgstr "Załaduj zaznaczenie"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -32480,7 +32545,9 @@
 #~ 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}\""
@@ -32489,4 +32556,5 @@
 #~ msgstr "EPSG:4326"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Nie znaleziono wtyczki: {0}."
@@ -32564,4 +32632,5 @@
 #~ msgstr "Nie zaimportowano danych."
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Błąd w czasie ładowania strony {0}"
@@ -32579,4 +32648,5 @@
 #~ msgstr "Sprzeczne relacje"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -32595,6 +32665,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."
@@ -32607,4 +32677,5 @@
 #~ msgstr "Wprowadź hasło"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin wymaga aktualizacji JOSM: {0}."
@@ -32613,4 +32684,5 @@
 #~ msgstr "<nd> nie posiada referencji"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Proszę zgłosić bład pod adresem {0}"
@@ -32623,6 +32695,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 "
@@ -32632,4 +32704,5 @@
 #~ msgstr "Znaleziono tag <member> w"
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Nie można odczytać \"{0}\""
@@ -32640,6 +32713,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:"
@@ -32650,6 +32723,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"
@@ -32672,4 +32745,5 @@
 #~ msgstr "Wystąpiły konfikty podczas importowania."
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32680,14 +32754,16 @@
 #~ " {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 ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32719,4 +32795,5 @@
 #~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Błąd przetwarzania adresu URL: \"{0}\""
@@ -32731,13 +32808,17 @@
 #~ 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 ""
@@ -32747,4 +32828,5 @@
 #~ msgstr "Wtyczka już istnieje"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32753,12 +32835,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 "
@@ -32776,6 +32858,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ć."
@@ -32804,10 +32886,13 @@
 #~ 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"
@@ -32853,4 +32938,5 @@
 #~ msgstr "brona"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Historia poleceń: {0}"
@@ -32881,7 +32967,9 @@
 #~ 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}"
@@ -32917,4 +33005,5 @@
 #~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Edytor relacji: {0}"
@@ -32926,4 +33015,5 @@
 #~ 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."
@@ -32935,4 +33025,5 @@
 #~ msgstr "Aktualizuj"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} wewnątrz ścieżki GPS."
@@ -32942,10 +33033,11 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
-#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w "
-#~ "liście historia poleceń."
-
+#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w liście "
+#~ "historia poleceń."
+
+#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
@@ -32991,6 +33083,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ć?"
@@ -33009,4 +33101,8 @@
 #~ msgstr "Zaktualizuj dane"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Błędy podczas pobierania"
+
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33025,6 +33121,5 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
 #~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
@@ -33032,10 +33127,11 @@
 
 #~ 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 "
@@ -33046,4 +33142,5 @@
 #~ msgstr "Nieprawidłowe odwzorowanie"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33072,12 +33169,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 ""
-#~ "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ąć?"
-
+#~ "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
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -33094,14 +33192,16 @@
 #~ 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>."
@@ -33110,16 +33210,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 ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
-#~ "lub <A HREF=\"{1}\">po polsku</A>."
-
+#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> lub "
+#~ "<A HREF=\"{1}\">po polsku</A>."
+
+#, java-format
 #~ 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}\"."
@@ -33134,7 +33237,9 @@
 #~ msgstr "usunięte, bądź przesunięte elementy"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -33143,2 +33248,9 @@
 #~ "<html>Powstały nierozwiązywalne automagicznie konflikty w warstwie "
 #~ "''{0}''.<br>Musisz je najpierw rozwiązać.</html>"
+
+#~ msgid "Apply also for children"
+#~ msgstr "Zastosuj także dla dzieci"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "D"
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 20:55+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-03 03:57+0000\n"
 "Last-Translator: Vitor George <vitor.george@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-02 08:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -205,6 +205,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
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -266,6 +266,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -320,9 +320,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
@@ -345,9 +345,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
@@ -438,6 +438,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -653,12 +653,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -893,5 +893,6 @@
 #: ../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
@@ -922,5 +923,6 @@
 "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
@@ -1067,5 +1069,6 @@
 #: ../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
@@ -1477,5 +1480,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1496,5 +1500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1646,5 +1650,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs"
@@ -1667,5 +1672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1816,6 +1821,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
@@ -1876,5 +1881,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Um nó que é usado em mais de um caminho e um destes caminhos, ou"
 
@@ -1947,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)"
@@ -1966,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:1037
@@ -2270,10 +2276,11 @@
 #, 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
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Erros ao Transferir"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Erros durante a obtenção de dados"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2307,7 +2314,7 @@
 msgstr "({0}/{1}) Carregando pais da relação {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Erros durante a obtenção de dados"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2442,6 +2449,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 "
@@ -2570,92 +2577,93 @@
 msgstr "<fim-de-arquivo>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Pesquisar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Busca por objetos."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Por favor digite um texto-filtro."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Por favor, entre com uma string de busca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Digite a expressão de pesquisa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "susbtitui a seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "adiciona à seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "remove da seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "encontre na seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "sensível à caixa alta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "expressão regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>Rua Augusta</b> - \"Rua\" e \"Augusta\" em qualquer chave ou valor."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr ""
+"<b>Rua Augusta</b> - \"Rua\" e \"Augusta\" em qualquer chave ou valor."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Rua Augusta\"</b> - ''Rua Augusta'' em qualquer chave ou nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Aug</b> - \"Aug\" em qualquer parte do nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - chave ''type'' com valor exato ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<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:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - ''Bak'' não existe no nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>mão única?</b> - oneway=yes, true,  1 ou on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - qualquer valor presente na chave=foot"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Destinos especiais:<u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2663,18 +2671,19 @@
 "<b>type:</b> - tipo de objeto (<b>nó</b>, <b>caminho</b>, <b>relação</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - todos os objetos modificados por determinado usuário"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgstr ""
+"<b>user:</b>... - todos os objetos modificados por determinado usuário"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>user:anonymous</b> - todos objetos modificados por usuários anônimos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objeto com pedido ID (0 para novos objetos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2684,5 +2693,5 @@
 "assignada)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2692,13 +2701,13 @@
 "(0 objetos sem conjunto de modificações assignados)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
 msgstr ""
 "<b>nós:</b>... - objeto com números de nós determinado (nós:quantidade ou "
 "nós:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2708,5 +2717,9 @@
 "ou tags:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2716,21 +2729,21 @@
 "(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> ou <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos os objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos os objetos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos os objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos objetos não tagueados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2738,5 +2751,5 @@
 "<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2745,14 +2758,14 @@
 "expressão"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> ou <b>OR</b> para combinar com \"ou\" lógico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 "Usar <b>\"</b> para comentar operadores (ex. se uma chave contem <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2762,11 +2775,11 @@
 "precedidos por <b>\\</b> (ex: <b>\\\"</b> e <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> e <b>)</b> para agrupar expressões"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2774,38 +2787,38 @@
 msgstr "Filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Aplicar o filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Iniciar Pesquisa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Não há valores coincidentes para ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nada adicionado à seleção pela busca por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nada foi removido da seleção quando buscado por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nada encontrado na seleção ao pesquisar por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2813,5 +2826,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2819,5 +2832,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2825,5 +2838,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2842,5 +2855,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2848,10 +2869,5 @@
 "chave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, 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!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2860,36 +2876,36 @@
 "ou relação."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Token não esperado. Esperava {0}, mas {1} foi encontrado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autenticação inesperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Parâmetro faltando para OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Operador faltando para NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Id de primitiva esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Intevalo de números esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Id de changeset esperado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Versão esperada"
@@ -2938,6 +2954,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
@@ -2961,5 +2977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3174,7 +3190,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> "
@@ -3456,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 ""
 "<html>O ficheiro de preferências contêm erros.<br> A fazer uma cópia de "
@@ -3550,5 +3566,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3557,5 +3573,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3564,5 +3580,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3601,5 +3617,5 @@
 "incluída"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3659,5 +3675,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3665,5 +3681,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3671,17 +3687,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Texto"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3689,5 +3699,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3696,5 +3706,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3702,5 +3712,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3708,5 +3718,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3714,42 +3724,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro ativo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos escondidos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos desabilitados"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Feche a janela de filtros para ver todos objetos.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Uma primitiva com ID = 0 não pode ser invisível."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 esperada. Obtida {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Esperada Versão> 0. Obtida {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3760,5 +3770,5 @@
 "do changesetId é {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3768,5 +3778,5 @@
 "outra não"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3826,8 +3836,9 @@
 #: ../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
@@ -3836,81 +3847,81 @@
 msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Caminho para Estilo de Área não está fechado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Mais de um caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Mais de um caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Encontrado mais de um parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Regra desconhecida \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro desconhecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Nenhum caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Nenhuma caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Estilo para restrição {0} não encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Estilo para caminho externo \"{0}\" contém erros."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Erro: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4086,5 +4097,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
@@ -4156,5 +4168,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4164,5 +4176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4171,5 +4183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4178,5 +4190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4185,5 +4197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4192,5 +4204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4199,9 +4211,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4422,6 +4434,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
@@ -4520,5 +4532,6 @@
 #, 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:168
@@ -4527,6 +4540,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4541,4 +4554,5 @@
 msgstr "Editar"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4701,6 +4715,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
@@ -4741,5 +4755,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4780,11 +4794,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
@@ -4814,5 +4828,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"
@@ -4821,5 +4835,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"
@@ -4828,5 +4842,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"
@@ -5021,5 +5035,6 @@
 #: ../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
@@ -5057,5 +5072,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar os elementos selecionados deles para o fim da lista de elementos "
@@ -5086,6 +5102,7 @@
 msgstr "Copie todos estes elementos para o alvo"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5097,5 +5114,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Abaixo"
@@ -5140,6 +5157,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 "
@@ -5149,6 +5166,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 "
@@ -5205,9 +5222,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
@@ -5442,6 +5459,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5454,6 +5471,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5704,6 +5721,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
@@ -5754,6 +5771,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
@@ -5771,7 +5788,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 "
@@ -5801,5 +5818,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 "Baixar informações sobre os conjuntos de modificações selecionados do "
@@ -5819,6 +5837,5 @@
 msgstr "Abre uma página web para cada changeset selecionado"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5844,5 +5861,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5850,5 +5867,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5925,16 +5942,17 @@
 #, 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
@@ -5951,13 +5969,13 @@
 msgstr "Resolver conflitos para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrar objetos e esconder/desativá-los"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5966,45 +5984,41 @@
 msgstr "Adicionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Adicionar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Apagar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Mover filtro para cima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Mover filtro para baixo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Habilitar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Esconder elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Aplicar também para filhos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Inverter filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Modo Filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6231,10 +6245,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Selecionar na lista de relações"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Selecionar uma relação na lista de relações"
@@ -6351,5 +6365,6 @@
 #: ../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
@@ -6592,4 +6607,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7670,6 +7686,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
@@ -7735,6 +7751,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: "
@@ -7765,13 +7781,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>"
 
@@ -7786,6 +7802,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
@@ -7798,13 +7814,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
@@ -7907,5 +7923,5 @@
 msgstr "Esta URL de pesquisa de conjunto de modificações é inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7914,23 +7930,23 @@
 msgstr[1] "Isto vai mudar até {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Um valor vazio deleta a tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7939,5 +7955,5 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7946,77 +7962,81 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Por favor, selecione os objetos que deseja modificar propriedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Propriedades/Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Propriedades dos objetos selecionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Deletar da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Confirmar a exclusão da relação {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da chave selecionada para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Selecionar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Selecione a relação na seleção principal."
@@ -8133,10 +8153,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
@@ -8153,6 +8173,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 "
@@ -8329,9 +8349,11 @@
 #, 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
@@ -8425,5 +8447,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
 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:217
@@ -8677,6 +8700,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 "<html>Nem <strong>{0}</strong> nem <strong>{1}</strong> estão ativos.<br>Por "
@@ -8738,4 +8762,5 @@
 msgstr "Consultando o servidor de nomes ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8818,14 +8843,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
@@ -8834,11 +8859,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
@@ -9122,8 +9147,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de "
@@ -9132,6 +9158,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
@@ -9145,12 +9171,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>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
@@ -9204,5 +9232,6 @@
 #, 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
@@ -9264,9 +9293,11 @@
 msgid "Select to close the changeset after the next upload"
 msgstr ""
+"Selecione para fechar o conjunto de modificações depois do próximo envio"
 
 #. putValue(NAME, tr("Reload"));
 #: ../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
@@ -9277,6 +9308,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
@@ -9408,5 +9439,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Lança diálogo para escolha de arquivo"
@@ -9423,5 +9454,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 "A camada ''{0}'' tem modificações que deveriam ser enviadas ao servidor."
@@ -9510,6 +9542,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] ""
@@ -9523,6 +9555,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,5 +9595,6 @@
 #: ../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
@@ -9754,5 +9787,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9778,10 +9811,12 @@
 
 #: ../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
@@ -9843,6 +9878,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 "
@@ -9900,7 +9935,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 "
@@ -9914,5 +9949,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9940,5 +9975,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é "
@@ -10168,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 ""
 
@@ -10194,7 +10230,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 ""
 
@@ -10258,6 +10294,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>O envio de dados não processados de GPS como mapa é considerado "
@@ -10273,5 +10309,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10441,6 +10477,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 ""
 
@@ -10500,7 +10536,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 ""
 
@@ -10565,64 +10601,68 @@
 msgstr "Adivinhar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Ajuste manual"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Sobrescreva a posição para: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Imagens que já estão etiquetadas ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Mostre miniaturas no mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Deslocamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Relacione as imagens com trilhas GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correlacione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Timezone inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Offset inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Tentar novamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Não foi possível encontrar imagens coincidente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Nenhum gpx selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10632,20 +10672,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Segundos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10654,5 +10694,5 @@
 msgstr[1] "Diferença de {0} dias"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10660,21 +10700,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Ajustar timezone e deslocamento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "As fotos selecionadas não contêm informação de tempo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "As fotos não contêm informação de tempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10682,17 +10722,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "Trilha GPX não tem informação de tempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Você tem que selecionar uma trilha GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Não selecionar trilha GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10703,5 +10743,5 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10752,14 +10792,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Correlacionar com GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10768,5 +10808,5 @@
 msgstr[1] "{0} imagens carregadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10775,10 +10815,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Remover arquivo de imagem do disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10787,5 +10827,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "O arquivo de imagem não pode ser removido."
@@ -11076,6 +11116,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 ""
 
@@ -11097,13 +11137,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
@@ -11124,7 +11164,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)."
 
@@ -11235,11 +11275,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
@@ -11355,5 +11395,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11498,8 +11539,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 ""
 
@@ -11586,8 +11627,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 ""
 
@@ -11614,7 +11655,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 ""
 
@@ -11686,35 +11727,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 "Mostrar ou ocultar entrada do menu de áudio na barra do menu principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11724,5 +11761,5 @@
 "áudio foi gravado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11730,23 +11767,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Criar automaticamente camada de marcadores a partir de todos pontos quando "
-"abrir um camada GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Ao importar áudio, faça marcadores para ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Ao importar áudio, aplique a qualquer ponto de via na camada GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11756,5 +11785,5 @@
 "pontos da via) com nomes e descrições."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11764,5 +11793,5 @@
 "modificação de cada arquivo de áudio WAV importados."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11772,17 +11801,18 @@
 "relevante for pressionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Avançar/voltar no tempo (segundos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "O montante pelo qual a velocidade é multiplicada para o avanço rápido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgstr ""
+"O montante pelo qual a velocidade é multiplicada para o avanço rápido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Multiplicador de avanço rápido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11792,13 +11822,13 @@
 "negativo) da faixa de áudio da posição requerida"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Calibração do gravador de voz"
@@ -11838,5 +11868,5 @@
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11847,34 +11877,34 @@
 msgstr "Tudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Nenhum"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Forçar linhas se nenhum segmento for importado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Desenhe pontos GPS grandes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Desenha um círculo com valor HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermelho = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Diluição da posição (vermelho = alta, verde = baixo, se disponível)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
@@ -11882,5 +11912,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11902,5 +11932,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11942,5 +11972,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11954,50 +11984,62 @@
 msgstr "A Pé"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Desenhar setas de direção"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Desenhar rápido (vai parecer feio)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Somente no sentido da via."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Desenhar número de sequência dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Desenhar os limites dos dados recebidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Desenhar nós virtuais no modo escollhido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Desenhar camadas inativas em cor diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos do mapa suavizados (anti-alias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Criar automaticamente camada de marcadores a partir de todos pontos quando "
+"abrir um camada GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Desenhar linhas entre os pontos GPS brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12007,9 +12049,9 @@
 "\"-1\" para desenhar todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Tamanho máximo para arquivos locais (em metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12018,10 +12060,10 @@
 "todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Tamanho máximo (em metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12030,11 +12072,12 @@
 "informações de linha."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Desenha setas de direção para linhas, conectando pontos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Desenha as setas de direção  usando tabelas de pesquisa ao invés de cálculos "
@@ -12042,5 +12085,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12049,13 +12092,13 @@
 "Não desenha a seta se ela não estiver a pelo menos esta distância da última."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Distância mínima (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenha pontos grandes para os pontos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12065,9 +12108,9 @@
 "personalizado no Gerenciador de Camadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12075,46 +12118,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Coloração de trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Pontos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Desenhar as camadas de dados inativas em uma cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Dados OSM"
@@ -12186,5 +12230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12233,6 +12278,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Atualizar plugins"
@@ -12311,6 +12356,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 ""
 
@@ -12323,9 +12368,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 ""
 
@@ -12625,6 +12670,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 ""
 
@@ -12752,6 +12797,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 ""
 
@@ -12773,6 +12818,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 ""
 
@@ -12837,6 +12882,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
@@ -12857,5 +12902,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12873,5 +12919,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 "Você já tem um token de acesso para acessar o servidor do OSM usando OAuth."
@@ -12971,6 +13018,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 "
@@ -13160,5 +13207,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
-msgstr "Contatando servidor OSM..."
+msgstr "Acessando Servidor OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
@@ -13273,5 +13320,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
@@ -13462,5 +13509,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13845,6 +13893,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 ""
 
@@ -13872,6 +13920,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 ""
 
@@ -13913,5 +13961,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -14345,14 +14394,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Não foi possível carregar plugin {0}. Apagar das preferências?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14361,23 +14415,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Não foi possível carregar plugin {0}. Apagar das preferências?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Carregando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Verificando pré-condições dos plugins..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Carregando plugin \"{0}\"..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14385,5 +14434,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14391,17 +14440,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14409,5 +14458,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14419,42 +14468,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Desabilitar plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Manter plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14463,5 +14512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14470,10 +14519,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14481,10 +14530,10 @@
 msgstr "Uma exceção não esperada pode ter ocorrido devido ao plugin ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acordo com as informações no plugin, o autor é {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14493,9 +14542,9 @@
 "bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "O plugin deve ser desabilitado?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14505,14 +14554,14 @@
 "desativar o plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Informações sobre o plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "sem descrição disponível"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14555,5 +14604,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14617,5 +14667,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"
@@ -14701,6 +14751,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 "
@@ -14710,7 +14760,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 ""
 
@@ -14718,7 +14768,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 ""
 
@@ -14726,8 +14776,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 ""
 
@@ -14749,7 +14799,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 ""
 
@@ -14820,6 +14870,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14831,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 ""
 
@@ -14863,9 +14914,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15542,7 +15593,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15552,5 +15603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15560,5 +15611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15574,5 +15625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15582,5 +15633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15611,5 +15662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15618,5 +15669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15625,5 +15676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15632,5 +15683,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15639,5 +15690,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15646,5 +15697,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15678,10 +15729,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -16159,34 +16211,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Usar"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Esquema de cores"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -16259,5 +16312,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16348,4 +16401,5 @@
 msgstr "Porta:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16555,5 +16609,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16674,5 +16728,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16691,6 +16746,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16996,5 +17052,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -17104,5 +17161,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -17153,5 +17211,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17587,5 +17646,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
-msgstr "Adicionar camada de rota"
+msgstr "Adicionar camada de roteamento"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
@@ -17972,4 +18031,12 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:288
 msgid "Terrace"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
 msgstr ""
 
@@ -18391,5 +18458,6 @@
 #: ../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
@@ -18419,6 +18487,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 "
@@ -18515,13 +18583,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
@@ -18576,8 +18644,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 ""
 
@@ -18702,6 +18770,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 ""
 
@@ -18709,6 +18777,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 ""
 
@@ -19347,6 +19415,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -19493,5 +19562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19592,5 +19661,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19846,5 +19915,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
-msgstr "Baixar tiles visíveis"
+msgstr "Baixar imagens visíveis"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
@@ -19965,9 +20034,6 @@
 msgstr "Arquivos WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19978,10 +20044,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Base de dados offline para manutenção"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19989,25 +20055,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Você deve tornar suas edições públicas para enviar novos dados"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20015,17 +20081,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "floresta"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20033,7 +20099,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20043,5 +20109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20084,5 +20150,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20092,5 +20158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20100,5 +20166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20108,8 +20174,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20123,5 +20189,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20132,5 +20198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20139,7 +20205,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20149,5 +20215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20157,5 +20223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20165,5 +20231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20173,5 +20239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20181,5 +20247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20189,5 +20255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20197,8 +20263,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20208,58 +20274,60 @@
 msgstr "rota"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Atributos opcionais:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Modificadores:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nome do arquivo"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Tipos de combustíveis:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Página inicial"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoísmo"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Aumentar zoom"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nova regra"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Criar novo nó."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Salvar"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20332,5 +20400,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -20498,6 +20567,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20506,5 +20582,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20513,10 +20589,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20525,5 +20601,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20533,5 +20609,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20540,15 +20616,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20557,10 +20633,10 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 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, "
+"...)."
 
 #. <!--
@@ -21447,7 +21523,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21587,8 +21663,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"/>
@@ -21798,5 +21874,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21806,5 +21882,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21823,5 +21899,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21831,5 +21907,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21848,5 +21924,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21856,5 +21932,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21873,5 +21949,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21881,5 +21957,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21894,5 +21970,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21910,5 +21986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21926,5 +22002,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21933,5 +22009,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21941,5 +22017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21959,5 +22035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21966,5 +22042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21974,5 +22050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22676,5 +22752,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22725,5 +22801,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22820,5 +22896,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22986,5 +23062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23318,5 +23394,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23326,5 +23402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23334,5 +23410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23342,5 +23418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23350,5 +23426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23358,5 +23434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23366,5 +23442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23375,5 +23451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24793,5 +24869,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24801,5 +24877,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24809,5 +24885,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24817,5 +24893,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25179,7 +25255,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25189,5 +25265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25197,5 +25273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25205,5 +25281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25213,5 +25289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25221,5 +25297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25229,5 +25305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25237,5 +25313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25245,5 +25321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25253,5 +25329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25261,5 +25337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25269,5 +25345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25277,5 +25353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25285,5 +25361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25293,5 +25369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25301,5 +25377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25309,5 +25385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25317,5 +25393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25325,5 +25401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25333,5 +25409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25341,5 +25417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25349,5 +25425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25357,5 +25433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25365,5 +25441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25373,5 +25449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25381,5 +25457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25389,5 +25465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25397,5 +25473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25405,5 +25481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25413,5 +25489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25421,5 +25497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25429,5 +25505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25437,5 +25513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25445,5 +25521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25453,5 +25529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25461,5 +25537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25469,5 +25545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25477,5 +25553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25485,5 +25561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25493,5 +25569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25501,5 +25577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25509,5 +25585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25517,5 +25593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25525,5 +25601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25533,5 +25609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25541,5 +25617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25549,5 +25625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27253,7 +27329,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27263,5 +27339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27271,5 +27347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27279,5 +27355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27287,5 +27363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27295,5 +27371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27303,5 +27379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27311,5 +27387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27319,5 +27395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28740,5 +28816,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28754,5 +28830,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28762,5 +28838,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28771,5 +28847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28782,7 +28858,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28792,5 +28868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28800,5 +28876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28808,5 +28884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28816,5 +28892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28848,5 +28924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28862,5 +28938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28870,5 +28946,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28877,5 +28953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28885,5 +28961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28894,5 +28970,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28917,5 +28993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29030,9 +29106,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
@@ -29040,5 +29116,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,
@@ -29048,8 +29124,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
@@ -29063,5 +29139,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29069,5 +29145,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29116,6 +29192,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>
@@ -29195,5 +29271,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29203,11 +29279,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29223,5 +29299,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29230,5 +29306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29237,5 +29313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29251,5 +29327,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29263,5 +29339,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29270,5 +29346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29277,5 +29353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29284,5 +29360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29291,5 +29367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29298,5 +29374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29305,5 +29381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29312,5 +29388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29319,5 +29395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29326,5 +29402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29333,5 +29409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29340,5 +29416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29347,5 +29423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29354,5 +29430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29361,5 +29437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29536,7 +29612,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29550,5 +29626,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29558,7 +29634,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29568,5 +29644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29576,5 +29652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29584,5 +29660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29592,5 +29668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29606,5 +29682,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29613,5 +29689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29621,5 +29697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29628,5 +29704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29635,5 +29711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29642,5 +29718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29649,5 +29725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29656,5 +29732,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29663,5 +29739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29670,5 +29746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29677,5 +29753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29684,5 +29760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29696,5 +29772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29708,5 +29784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29715,5 +29791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29727,5 +29803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29740,5 +29816,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29753,5 +29829,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29765,5 +29841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29777,5 +29853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29784,5 +29860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29791,5 +29867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29799,5 +29875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29806,5 +29882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29813,5 +29889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29820,5 +29896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29828,5 +29904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29837,5 +29913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29845,7 +29921,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29855,5 +29931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29863,5 +29939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29871,5 +29947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29880,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29887,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29895,5 +29971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29903,5 +29979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29911,5 +29987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29919,5 +29995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29927,5 +30003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29935,5 +30011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29943,5 +30019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29951,5 +30027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29959,5 +30035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29980,5 +30056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29993,7 +30069,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30003,5 +30079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30010,5 +30086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30018,5 +30094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30025,5 +30101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30033,5 +30109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30041,5 +30117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30055,5 +30131,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30064,5 +30140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30081,5 +30157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30089,5 +30165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30100,5 +30176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30117,5 +30193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30124,5 +30200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30131,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30138,7 +30214,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30149,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30162,5 +30238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30174,5 +30250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30182,5 +30258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30194,5 +30270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30206,5 +30282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30213,5 +30289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30220,7 +30296,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30230,5 +30306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30238,5 +30314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30246,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30254,5 +30330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30262,5 +30338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30276,7 +30352,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30291,5 +30367,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30304,5 +30380,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30317,5 +30393,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30330,5 +30406,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30343,5 +30419,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30356,7 +30432,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30366,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30373,5 +30449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30381,5 +30457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30389,5 +30465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30397,5 +30473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30405,5 +30481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30413,5 +30489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30421,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30429,5 +30505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30437,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30445,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30453,5 +30529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30461,5 +30537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30479,5 +30555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30492,5 +30568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30503,7 +30579,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30513,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30521,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30529,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30537,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30545,5 +30621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30553,5 +30629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30561,5 +30637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30569,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30577,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30585,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30593,5 +30669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30601,5 +30677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30609,5 +30685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30617,5 +30693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30625,5 +30701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30633,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30653,5 +30729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30665,7 +30741,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30675,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30683,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30691,5 +30767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30699,5 +30775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30707,5 +30783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30715,5 +30791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30723,5 +30799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30731,5 +30807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30739,5 +30815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30747,5 +30823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30764,5 +30840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30772,5 +30848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30780,5 +30856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30788,5 +30864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30796,5 +30872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30804,5 +30880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30812,5 +30888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30820,5 +30896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30828,5 +30904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30836,5 +30912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30844,5 +30920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30852,5 +30928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30869,5 +30945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30876,5 +30952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30884,5 +30960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30891,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30899,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30907,5 +30983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30915,5 +30991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30922,5 +30998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30930,5 +31006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30938,5 +31014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30946,5 +31022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30954,5 +31030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30961,5 +31037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30968,5 +31044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30975,5 +31051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30982,5 +31058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30989,5 +31065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30996,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31003,5 +31079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31010,5 +31086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31017,5 +31093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31024,5 +31100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31031,5 +31107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31038,5 +31114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31045,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31053,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31061,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31069,5 +31145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31077,5 +31153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31085,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31093,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31101,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31109,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31117,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31126,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31134,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31142,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31150,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31158,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31166,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31174,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31182,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31190,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31198,5 +31274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31206,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31214,5 +31290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31222,5 +31298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31230,5 +31306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31238,5 +31314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31246,5 +31322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31254,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31262,5 +31338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31270,5 +31346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31278,5 +31354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31285,5 +31361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31315,5 +31391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31323,5 +31399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31331,7 +31407,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31346,5 +31422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31354,5 +31430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31362,5 +31438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31370,5 +31446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31378,5 +31454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31386,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31394,5 +31470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -31408,7 +31484,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31418,5 +31494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31426,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31434,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31442,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31450,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31458,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31466,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31474,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31482,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31490,5 +31566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31498,5 +31574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31506,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31514,5 +31590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31522,5 +31598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31530,5 +31606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31538,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31546,5 +31622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31554,5 +31630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31562,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31570,5 +31646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31578,5 +31654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31586,5 +31662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31594,5 +31670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31602,5 +31678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31610,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31618,5 +31694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31626,5 +31702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31634,5 +31710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31642,5 +31718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31650,5 +31726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31658,5 +31734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31666,5 +31742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31674,5 +31750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31682,5 +31758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31690,5 +31766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31698,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31706,5 +31782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31714,5 +31790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31722,5 +31798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31730,5 +31806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31738,5 +31814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31746,5 +31822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31780,7 +31856,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31790,5 +31866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31798,5 +31874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31806,5 +31882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31814,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31822,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31830,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31838,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31853,5 +31929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31861,5 +31937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31869,5 +31945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31877,5 +31953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31885,5 +31961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31893,5 +31969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31902,5 +31978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31910,5 +31986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31918,5 +31994,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31926,5 +32002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31933,5 +32009,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31940,5 +32016,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31956,7 +32032,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31966,5 +32042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31974,5 +32050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31982,5 +32058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31990,5 +32066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31998,5 +32074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32006,5 +32082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32014,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32022,5 +32098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32030,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32046,5 +32122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32058,5 +32134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32070,5 +32146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32078,5 +32154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32090,5 +32166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32102,6 +32178,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32111,5 +32187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32123,5 +32199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32135,5 +32211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32147,5 +32223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32159,5 +32235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32171,5 +32247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32179,7 +32255,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32189,5 +32265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32197,5 +32273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32205,5 +32281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32213,5 +32289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32228,5 +32304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32239,5 +32315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32251,5 +32327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32263,5 +32339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32275,5 +32351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32284,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32292,5 +32368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32300,5 +32376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32308,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32316,5 +32392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32331,5 +32407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32343,5 +32419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32355,5 +32431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32367,5 +32443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32379,5 +32455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -32392,5 +32468,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?
@@ -32416,5 +32492,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32425,11 +32501,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32439,5 +32515,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32447,5 +32523,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32455,5 +32531,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32463,5 +32539,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32471,5 +32547,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32479,5 +32555,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32487,5 +32563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32495,5 +32571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32503,5 +32579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32511,5 +32587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32519,5 +32595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32527,5 +32603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32545,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32638,5 +32714,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32644,28 +32720,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
@@ -32780,5 +32856,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32791,5 +32867,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>
@@ -32814,6 +32890,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32822,6 +32898,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32836,6 +32912,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
@@ -32849,6 +32925,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
@@ -32868,6 +32944,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32891,6 +32967,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
@@ -32939,4 +33015,5 @@
 #~ msgstr "Encontrado elemento <member> em non-relation."
 
+#, java-format
 #~ msgid ""
 #~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
@@ -32952,4 +33029,5 @@
 #~ msgstr "Identificação de nó mal-formada"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin não encontrado: {0}."
@@ -32965,4 +33043,5 @@
 #~ msgstr "<nd> tem ref zero"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Por favor, reporte um erro em {0}"
@@ -32979,9 +33058,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:"
@@ -32991,13 +33070,17 @@
 #~ 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"
@@ -33013,10 +33096,11 @@
 
 #~ 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."
-
+#~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem permissão "
+#~ "de sobreescrever os existentes."
+
+#, java-format
 #~ 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"
@@ -33026,16 +33110,21 @@
 #~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor."
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
 
+#, 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 "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"
@@ -33100,7 +33189,9 @@
 #~ 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}''"
@@ -33142,7 +33233,9 @@
 #~ 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}"
@@ -33160,4 +33253,5 @@
 #~ msgstr "Combinar conflitos"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pilha de comandos: {0}"
@@ -33184,4 +33278,5 @@
 #~ 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}"
@@ -33191,9 +33286,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?"
@@ -33229,9 +33324,8 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
-#~ "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."
@@ -33256,4 +33350,5 @@
 #~ 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}\""
@@ -33265,4 +33360,5 @@
 #~ msgstr "Arquivo não encontrado"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Imagens para {0}"
@@ -33280,6 +33376,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 "
@@ -33298,4 +33394,7 @@
 #~ msgstr "Primitiva já deletada"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Erros ao Transferir"
+
 #~ msgid "Deleted or moved primitives"
 #~ msgstr "Primitivas deletadas ou movidas"
@@ -33313,4 +33412,5 @@
 #~ msgstr "Envio para API OSM falhou"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33319,10 +33419,12 @@
 #~ 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>"
-
+#~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro "
+#~ "é:<br>{0}</html>"
+
+#, java-format
 #~ 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 "
@@ -33332,4 +33434,5 @@
 #~ "primitivas selecionadas"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33340,6 +33443,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 "
@@ -33355,17 +33458,18 @@
 #~ 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."
@@ -33392,8 +33496,9 @@
 #~ "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?"
+
+#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "\"{0}\" não é um caminho no multipolígono."
@@ -33402,4 +33507,5 @@
 #~ msgstr "Carregar Seleção"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contato {0}..."
@@ -33408,17 +33514,20 @@
 #~ 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}\""
@@ -33427,4 +33536,5 @@
 #~ msgstr "Purgando 1 primitiva"
 
+#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removendo referência de caminho {0}"
@@ -33442,4 +33552,5 @@
 #~ msgstr "relações"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33462,6 +33573,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"
@@ -33469,10 +33580,9 @@
 
 #~ 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"
 
@@ -33537,7 +33647,9 @@
 #~ 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."
@@ -33567,17 +33679,18 @@
 #~ 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}"
@@ -33586,10 +33699,13 @@
 #~ 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}"
@@ -33608,9 +33724,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"
@@ -33626,30 +33742,36 @@
 #~ 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
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ 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>."
-#~ 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}''"
@@ -33661,4 +33783,5 @@
 #~ 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}"
@@ -33670,13 +33793,17 @@
 #~ 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}"
@@ -33685,4 +33812,5 @@
 #~ msgstr "Mostrar histórico da primitiva selecionada"
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Não foi possível ler \"{0}\""
@@ -33694,24 +33822,28 @@
 #~ 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>"
-
+#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da "
+#~ "relação?</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>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 "Parameter ''{0}'' must not be null"
 #~ msgstr "Parâmetro \"{0}\" não pode ser nulo"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -33724,13 +33856,20 @@
 #~ 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!"
+
 #~ msgid "Wrong number of parameters for tags operator."
 #~ 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"
@@ -33745,27 +33884,32 @@
 #~ "Deseja continuar?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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."
-
+#~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número é "
+#~ "esperado."
+
+#, java-format
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
+
+#~ msgid "Apply also for children"
+#~ msgstr "Aplicar também para filhos"
 
 #~ msgid "Enter a changset id"
@@ -33782,7 +33926,8 @@
 #~ "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"
@@ -33796,11 +33941,15 @@
 
 #~ 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"
+#~ msgid "C"
+#~ msgstr "C"
 
 #~ msgid "GPS point"
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:56+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 12:21+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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -92,5 +92,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -260,6 +260,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -316,6 +316,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 +339,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
@@ -432,6 +432,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -645,12 +645,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1437,5 +1437,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1456,5 +1457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1604,5 +1605,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 
@@ -1624,5 +1626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1822,5 +1824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
@@ -1886,9 +1889,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)"
@@ -1905,5 +1908,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2193,6 +2196,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr ""
 
@@ -2227,6 +2230,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2357,6 +2360,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 ""
 
@@ -2474,68 +2477,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Caută..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Caută obiecte"
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Vă rog introduceţi un şir de căutat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "Înlocuieşte selecţia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "adaugă la selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "elimină din selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
-msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2543,38 +2546,38 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+msgid "<u>Special targets:</u>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
-msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
-msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
-msgid "<b>foot:</b> - key=foot set to any value."
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
-msgid "<u>Special targets:</u>"
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
-msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2582,5 +2585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2588,11 +2591,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2600,5 +2603,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2606,39 +2613,39 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+msgid "<b>modified</b> - all changed objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgid "<b>selected</b> - all selected objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
-msgid "<b>modified</b> - all changed objects"
+msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
-msgid "<b>selected</b> - all selected objects"
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
-msgid "<b>incomplete</b> - all incomplete objects"
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
-msgid "<b>untagged</b> - all untagged objects"
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2646,11 +2653,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2658,38 +2665,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Căutare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2697,5 +2704,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2703,5 +2710,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2709,5 +2716,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2722,50 +2729,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2829,5 +2839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3036,7 +3046,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 ""
 
@@ -3297,6 +3307,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 ""
 
@@ -3379,5 +3389,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3386,5 +3396,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3393,5 +3403,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3428,5 +3438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3479,5 +3489,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3485,5 +3495,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3491,17 +3501,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr ""
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3509,5 +3513,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3516,5 +3520,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3522,5 +3526,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3528,5 +3532,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3534,42 +3538,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3578,5 +3582,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3584,5 +3588,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3640,5 +3644,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3648,81 +3653,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3896,5 +3901,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3965,5 +3971,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3973,5 +3979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3980,5 +3986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3987,5 +3993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3994,5 +4000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4001,5 +4007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4008,9 +4014,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4321,6 +4327,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4335,4 +4341,5 @@
 msgstr "Editare"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4525,5 +4532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4562,6 +4569,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 ""
 
@@ -4592,5 +4599,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"
@@ -4599,5 +4606,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"
@@ -4606,5 +4613,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"
@@ -4818,5 +4825,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4841,6 +4849,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4852,5 +4861,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr ""
@@ -4895,6 +4904,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 ""
 
@@ -4902,6 +4911,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 ""
 
@@ -4952,6 +4961,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 ""
 
@@ -5168,6 +5177,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5180,6 +5189,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5477,7 +5486,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 ""
 
@@ -5502,5 +5511,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5518,6 +5528,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5541,5 +5550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5547,5 +5556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5622,9 +5631,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5642,13 +5652,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5657,45 +5667,41 @@
 msgstr "Adaugă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5922,10 +5928,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6266,4 +6272,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7377,6 +7384,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 ""
 
@@ -7400,8 +7407,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 ""
 
@@ -7521,5 +7528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7528,23 +7535,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferit>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7553,5 +7560,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7560,78 +7567,82 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7746,6 +7757,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 ""
 
@@ -7763,6 +7774,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 ""
 
@@ -7917,6 +7928,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8248,6 +8260,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8307,4 +8320,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8387,6 +8401,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 ""
 
@@ -8396,6 +8410,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 ""
 
@@ -8669,8 +8683,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8685,7 +8700,8 @@
 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 +8937,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8936,5 +8952,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9019,6 +9036,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] ""
@@ -9032,6 +9049,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 "
@@ -9257,5 +9274,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9281,5 +9298,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9334,6 +9352,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 ""
 
@@ -9387,7 +9405,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 ""
 
@@ -9397,5 +9415,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9422,5 +9440,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9638,7 +9657,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 +9683,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 +9747,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 
@@ -9741,5 +9760,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9903,6 +9922,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 ""
 
@@ -9966,7 +9985,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 ""
 
@@ -10031,64 +10050,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10098,20 +10121,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10120,5 +10143,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10126,21 +10149,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10148,17 +10171,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10167,5 +10190,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10216,14 +10239,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10232,5 +10255,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10239,10 +10262,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10251,5 +10274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10533,6 +10556,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 +10577,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 +10698,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,5 +10807,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10916,8 +10940,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 ""
 
@@ -11000,8 +11024,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 ""
 
@@ -11028,7 +11052,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 ""
 
@@ -11099,34 +11123,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11134,5 +11154,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11140,21 +11160,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11162,5 +11176,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11168,5 +11182,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11174,17 +11188,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11192,13 +11206,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11238,5 +11252,5 @@
 msgstr "Culori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11247,34 +11261,34 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Forţează linii dacă nu a fost importat nici un segment."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Desenează puncte GPS mari."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Velocity (red = slow, green = fast)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
-msgid "Velocity (red = slow, green = fast)"
+msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11282,5 +11296,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11302,5 +11316,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11342,5 +11356,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11354,50 +11368,60 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Desenează săgeţi direcţionale"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+msgid "Only on the head of a way."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
-msgid "Only on the head of a way."
+msgid "Draw segment order numbers"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw segment order numbers"
+msgid "Draw boundaries of downloaded data"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw boundaries of downloaded data"
+msgid "Draw virtual nodes in select mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw virtual nodes in select mode"
+msgid "Draw inactive layers in other color"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw inactive layers in other color"
+msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11405,19 +11429,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11426,15 +11450,16 @@
 "despre linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11442,13 +11467,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenează puncte mai pari pentru punctele GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11456,9 +11481,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11466,46 +11491,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Date OSM"
@@ -11577,5 +11603,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11624,6 +11651,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11700,6 +11727,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 +11739,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 ""
 
@@ -12013,6 +12040,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 ""
 
@@ -12134,6 +12161,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 ""
 
@@ -12155,6 +12182,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 ""
 
@@ -12232,5 +12259,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12246,5 +12274,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12338,6 +12367,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 ""
 
@@ -12634,5 +12663,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
@@ -12813,5 +12842,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13196,6 +13226,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 ""
 
@@ -13223,6 +13253,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 ""
 
@@ -13264,5 +13294,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13692,14 +13723,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13708,23 +13744,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13732,5 +13763,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13738,17 +13769,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13756,5 +13787,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13766,42 +13797,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13810,5 +13841,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13817,30 +13848,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
-#, java-format
-msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13848,14 +13879,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13896,5 +13927,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13956,5 +13988,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"
@@ -14037,6 +14069,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 ""
 
@@ -14044,7 +14076,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 ""
 
@@ -14052,7 +14084,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 ""
 
@@ -14060,8 +14092,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 ""
 
@@ -14081,7 +14113,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 ""
 
@@ -14150,6 +14182,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14161,7 +14194,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 ""
 
@@ -14193,9 +14226,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14851,7 +14884,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14861,5 +14894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14869,5 +14902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14883,5 +14916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14891,5 +14924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -14920,5 +14953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -14927,5 +14960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -14934,5 +14967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -14941,5 +14974,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -14948,5 +14981,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -14955,5 +14988,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -14987,10 +15020,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15464,34 +15498,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -15564,5 +15599,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15653,4 +15688,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15860,5 +15896,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -15979,5 +16015,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -15996,6 +16033,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16301,5 +16339,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -16409,5 +16448,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16458,5 +16498,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17272,4 +17313,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17714,6 +17763,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 ""
 
@@ -17799,8 +17848,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 ""
 
@@ -17854,8 +17903,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 ""
 
@@ -17967,6 +18016,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 ""
 
@@ -17974,6 +18023,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 ""
 
@@ -18607,6 +18656,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18753,5 +18803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18851,5 +18901,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19224,9 +19274,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19235,10 +19282,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr ""
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19246,25 +19293,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19272,17 +19319,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr ""
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19290,7 +19337,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19300,5 +19347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19341,5 +19388,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19349,5 +19396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19357,5 +19404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19365,8 +19412,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19380,5 +19427,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19389,5 +19436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19396,7 +19443,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19406,5 +19453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19414,5 +19461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19422,5 +19469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19430,5 +19477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19438,5 +19485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19446,5 +19493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19454,8 +19501,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19465,52 +19512,60 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
 msgid "Attributes"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
 msgid "Modified"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Nume real"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Pagina pricipală"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "List"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
 msgid "Look in:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
 msgid "New Folder"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Creează nod nou"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Salvează"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19581,5 +19636,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19745,6 +19801,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19753,5 +19816,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19760,10 +19823,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19772,5 +19835,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19780,5 +19843,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19787,15 +19850,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19804,5 +19867,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20692,7 +20755,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20832,8 +20895,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"/>
@@ -21043,5 +21106,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21051,5 +21114,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21068,5 +21131,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21076,5 +21139,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21093,5 +21156,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21101,5 +21164,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21118,5 +21181,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21126,5 +21189,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21139,5 +21202,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21155,5 +21218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21171,5 +21234,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21178,5 +21241,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21186,5 +21249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21204,5 +21267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21211,5 +21274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21219,5 +21282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21921,5 +21984,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -21970,5 +22033,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22065,5 +22128,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22231,5 +22294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22563,5 +22626,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22571,5 +22634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22579,5 +22642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22587,5 +22650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22595,5 +22658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22603,5 +22666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22611,5 +22674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22620,5 +22683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24038,5 +24101,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24046,5 +24109,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24054,5 +24117,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24062,5 +24125,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24424,7 +24487,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24434,5 +24497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24442,5 +24505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24450,5 +24513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24458,5 +24521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24466,5 +24529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24474,5 +24537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24482,5 +24545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24490,5 +24553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24498,5 +24561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24506,5 +24569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24514,5 +24577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24522,5 +24585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24530,5 +24593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24538,5 +24601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24546,5 +24609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24554,5 +24617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24562,5 +24625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24570,5 +24633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24578,5 +24641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24586,5 +24649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24594,5 +24657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24602,5 +24665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24610,5 +24673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24618,5 +24681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24626,5 +24689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24634,5 +24697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24642,5 +24705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24650,5 +24713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24658,5 +24721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24666,5 +24729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24674,5 +24737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24682,5 +24745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24690,5 +24753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24698,5 +24761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24706,5 +24769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24714,5 +24777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24722,5 +24785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24730,5 +24793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24738,5 +24801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24746,5 +24809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24754,5 +24817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24762,5 +24825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24770,5 +24833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24778,5 +24841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24786,5 +24849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24794,5 +24857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26498,7 +26561,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26508,5 +26571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26516,5 +26579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26524,5 +26587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26532,5 +26595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26540,5 +26603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26548,5 +26611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26556,5 +26619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26564,5 +26627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -27985,5 +28048,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -27999,5 +28062,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28007,5 +28070,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28016,5 +28079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28027,7 +28090,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28037,5 +28100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28045,5 +28108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28053,5 +28116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28061,5 +28124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28093,5 +28156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28107,5 +28170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28115,5 +28178,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28122,5 +28185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28130,5 +28193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28139,5 +28202,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28162,5 +28225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28275,9 +28338,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
@@ -28285,5 +28348,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,
@@ -28293,8 +28356,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
@@ -28308,5 +28371,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28314,5 +28377,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28361,6 +28424,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>
@@ -28440,5 +28503,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28448,11 +28511,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28468,5 +28531,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28475,5 +28538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28482,5 +28545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28496,5 +28559,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28508,5 +28571,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28515,5 +28578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28522,5 +28585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28529,5 +28592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28536,5 +28599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28543,5 +28606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28550,5 +28613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28557,5 +28620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28564,5 +28627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28571,5 +28634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28578,5 +28641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28585,5 +28648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28592,5 +28655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28599,5 +28662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28606,5 +28669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28781,7 +28844,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28795,5 +28858,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28803,7 +28866,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28813,5 +28876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28821,5 +28884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28829,5 +28892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28837,5 +28900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28851,5 +28914,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28858,5 +28921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28866,5 +28929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -28873,5 +28936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -28880,5 +28943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -28887,5 +28950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -28894,5 +28957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -28901,5 +28964,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -28908,5 +28971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -28915,5 +28978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -28922,5 +28985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -28929,5 +28992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -28941,5 +29004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -28953,5 +29016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -28960,5 +29023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -28972,5 +29035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -28985,5 +29048,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -28998,5 +29061,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29010,5 +29073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29022,5 +29085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29029,5 +29092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29036,5 +29099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29044,5 +29107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29051,5 +29114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29058,5 +29121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29065,5 +29128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29073,5 +29136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29082,5 +29145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29090,7 +29153,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29100,5 +29163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29108,5 +29171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29116,5 +29179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29125,5 +29188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29132,5 +29195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29140,5 +29203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29148,5 +29211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29156,5 +29219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29164,5 +29227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29172,5 +29235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29180,5 +29243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29188,5 +29251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29196,5 +29259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29204,5 +29267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29225,5 +29288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29238,7 +29301,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29248,5 +29311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29255,5 +29318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29263,5 +29326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29270,5 +29333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29278,5 +29341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29286,5 +29349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29300,5 +29363,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29309,5 +29372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29326,5 +29389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29334,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29345,5 +29408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29362,5 +29425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29369,5 +29432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29376,5 +29439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29383,7 +29446,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29394,5 +29457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29407,5 +29470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29419,5 +29482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29427,5 +29490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29439,5 +29502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29451,5 +29514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29458,5 +29521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29465,7 +29528,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29475,5 +29538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29483,5 +29546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29491,5 +29554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29499,5 +29562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29507,5 +29570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29521,7 +29584,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29536,5 +29599,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29549,5 +29612,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29562,5 +29625,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29575,5 +29638,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29588,5 +29651,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29601,7 +29664,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29611,5 +29674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29618,5 +29681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29626,5 +29689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29634,5 +29697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29642,5 +29705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29650,5 +29713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29658,5 +29721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29666,5 +29729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29674,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29682,5 +29745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29690,5 +29753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29698,5 +29761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29706,5 +29769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29724,5 +29787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29737,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29748,7 +29811,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29758,5 +29821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29766,5 +29829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29774,5 +29837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29782,5 +29845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29790,5 +29853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29798,5 +29861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29806,5 +29869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29814,5 +29877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29822,5 +29885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29830,5 +29893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29838,5 +29901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29846,5 +29909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29854,5 +29917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29862,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -29870,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -29878,5 +29941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -29898,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -29910,7 +29973,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -29920,5 +29983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -29928,5 +29991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -29936,5 +29999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -29944,5 +30007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -29952,5 +30015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -29960,5 +30023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -29968,5 +30031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -29976,5 +30039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -29984,5 +30047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -29992,5 +30055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30009,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30017,5 +30080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30025,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30033,5 +30096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30041,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30049,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30057,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30065,5 +30128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30073,5 +30136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30081,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30089,5 +30152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30097,5 +30160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30114,5 +30177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30121,5 +30184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30129,5 +30192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30136,5 +30199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30144,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30152,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30160,5 +30223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30167,5 +30230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30175,5 +30238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30183,5 +30246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30191,5 +30254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30199,5 +30262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30206,5 +30269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30213,5 +30276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30220,5 +30283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30227,5 +30290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30234,5 +30297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30241,5 +30304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30248,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30255,5 +30318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30262,5 +30325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30269,5 +30332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30276,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30283,5 +30346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30290,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30298,5 +30361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30306,5 +30369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30314,5 +30377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30322,5 +30385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30330,5 +30393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30338,5 +30401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30346,5 +30409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30354,5 +30417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30362,5 +30425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30371,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30379,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30387,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30395,5 +30458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30403,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30411,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30419,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30427,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30435,5 +30498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30443,5 +30506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30451,5 +30514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30459,5 +30522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30467,5 +30530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30475,5 +30538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30483,5 +30546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30491,5 +30554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30499,5 +30562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30507,5 +30570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30515,5 +30578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30523,5 +30586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30530,5 +30593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30560,5 +30623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30568,5 +30631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30576,7 +30639,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30591,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30599,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30607,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30615,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30623,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30631,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30639,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30653,7 +30716,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30663,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30671,5 +30734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30679,5 +30742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30687,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30695,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30703,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30711,5 +30774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30719,5 +30782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30727,5 +30790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30735,5 +30798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30743,5 +30806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30751,5 +30814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30759,5 +30822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30767,5 +30830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30775,5 +30838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30783,5 +30846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30791,5 +30854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30799,5 +30862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30807,5 +30870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30815,5 +30878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30823,5 +30886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30831,5 +30894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30839,5 +30902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30847,5 +30910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30855,5 +30918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30863,5 +30926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -30871,5 +30934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -30879,5 +30942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -30887,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -30895,5 +30958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -30903,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -30911,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -30919,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -30927,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -30935,5 +30998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -30943,5 +31006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -30951,5 +31014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -30959,5 +31022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -30967,5 +31030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -30975,5 +31038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -30983,5 +31046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -30991,5 +31054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31025,7 +31088,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31035,5 +31098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31043,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31051,5 +31114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31059,5 +31122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31067,5 +31130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31075,5 +31138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31083,5 +31146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31098,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31106,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31114,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31122,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31130,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31138,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31147,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31155,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31163,5 +31226,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31171,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31178,5 +31241,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31185,5 +31248,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31201,7 +31264,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31211,5 +31274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31219,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31227,5 +31290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31235,5 +31298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31243,5 +31306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31251,5 +31314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31259,5 +31322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31267,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31275,5 +31338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31291,5 +31354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31303,5 +31366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31315,5 +31378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31323,5 +31386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31335,5 +31398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31347,6 +31410,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31356,5 +31419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31368,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31380,5 +31443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31392,5 +31455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31404,5 +31467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31416,5 +31479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31424,7 +31487,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31434,5 +31497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31442,5 +31505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31450,5 +31513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31458,5 +31521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31473,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31484,5 +31547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31496,5 +31559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31508,5 +31571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31520,5 +31583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31529,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31537,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31545,5 +31608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31553,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31561,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31576,5 +31639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31588,5 +31651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31600,5 +31663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31612,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31624,5 +31687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31637,5 +31700,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?
@@ -31661,5 +31724,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31670,11 +31733,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31684,5 +31747,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31692,5 +31755,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31700,5 +31763,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31708,5 +31771,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31716,5 +31779,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31724,5 +31787,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31732,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31740,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31748,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31756,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31764,5 +31827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31772,5 +31835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31790,5 +31853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -31883,5 +31946,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -31889,28 +31952,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
@@ -32025,5 +32088,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32036,5 +32099,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>
@@ -32059,6 +32122,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32067,6 +32130,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32081,6 +32144,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
@@ -32094,6 +32157,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
@@ -32113,6 +32176,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32136,6 +32199,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
@@ -32164,10 +32227,11 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
-#~ "Readu toate obiectele selectate curent la starea din versiunea selectată "
-#~ "în lista de istoric."
-
+#~ "Readu toate obiectele selectate curent la starea din versiunea selectată în "
+#~ "lista de istoric."
+
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contactez {0}..."
@@ -32179,7 +32243,9 @@
 #~ 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}"
@@ -32188,13 +32254,17 @@
 #~ 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ă."
@@ -32203,7 +32273,9 @@
 #~ 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}\"."
@@ -32230,10 +32302,9 @@
 
 #~ 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"
 
@@ -32268,4 +32339,5 @@
 #~ msgstr "Extensie fişier necunoscută."
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Modulul nu a fost găsit: {0}."
@@ -32277,4 +32349,5 @@
 #~ 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 21602)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 21603)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:03+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-06-07 09:15+0200\n"
+"PO-Revision-Date: 2010-06-07 06:04+0000\n"
+"Last-Translator: Calibrator <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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -91,5 +91,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -266,6 +266,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -440,6 +440,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -655,12 +655,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -781,5 +781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "Указан неверный ID. Невозможно загрузить объект."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -1483,5 +1483,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1502,5 +1503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1674,5 +1675,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -2250,5 +2251,15 @@
 "report a conflict."
 msgstr[0] ""
+"В вашем локальном наборе данных {0} объект, который необходимо удалить на "
+"сервере. Если позднее вы попробуете  удалить или обновить его, сервер "
+"уведомит вас о наличии конфликта."
 msgstr[1] ""
+"В вашем локальном наборе данных {0} объекта, которые необходимо удалить на "
+"сервере. Если позднее вы попробуете  удалить или обновить их, сервер "
+"уведомит вас о наличии конфликтов."
+msgstr[2] ""
+"В вашем локальном наборе данных {0} объектов, которые необходимо удалить на "
+"сервере. Если позднее вы попробуете  удалить или обновить их, сервер "
+"уведомит вас о наличии конфликтов."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
@@ -2259,10 +2270,14 @@
 "Click <strong>{0}</strong> to check the state of these objects on the server."
 msgstr[0] ""
+"Нажмите <strong>{0}</strong>, чтобы проверить состояние объекта на сервере."
 msgstr[1] ""
+"Нажмите <strong>{0}</strong>, чтобы проверить состояние объектов на сервере."
+msgstr[2] ""
+"Нажмите <strong>{0}</strong>, чтобы проверить состояние объектов на сервере."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 #, java-format
 msgid "Click <strong>{0}</strong> to ignore.</html>"
-msgstr ""
+msgstr "Нажмите <strong>{0}</strong>, чтобы проигнорировать.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178
@@ -2276,7 +2291,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Ошибка во время скачивания"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Ошибки при скачивании с сервера"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2312,7 +2327,7 @@
 msgstr "({0}/{1}) Загрузка родителей отношения {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Ошибки при скачивании с сервера"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr "Ошибка во время скачивания с сервера"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2583,10 +2598,10 @@
 msgstr "<end-of-file>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Поиск..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Поиск объектов."
@@ -2594,58 +2609,58 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Пожалуйста, введите строку фильтра"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Пожалуйста, введите строку для поиска."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Введите выражение для поиска"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "заменить выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "добавить к выделению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "убрать из выделения"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "найти в выделенном"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "регистрозависимый"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "регулярное выражение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - ''Baker'' и ''Street'' в любом ключе или названии."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' в любом ключе или названии."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' в любом месте названия."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - ключ ''type'' с точным значением ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2655,21 +2670,21 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - название не содержит ''Bak''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 или on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot установить в любое значение."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Специальные цели:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2678,18 +2693,18 @@
 "(линия), <b>relation</b>(отношение)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - все объекты, изменённые пользователем"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>user:anonymous</b> - все объекты, изменённые анонимным пользователем"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - объект с данным ID (0 для новых объектов)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2699,5 +2714,5 @@
 "версии)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2707,5 +2722,5 @@
 "назначенного пакета правок)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2715,5 +2730,5 @@
 "nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2723,5 +2738,9 @@
 "мин-макс)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr "<b>role:</b>… — объект с указанной ролью в отношении"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2731,21 +2750,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> или <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - все изменённые объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - все выделенные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - все незаконченные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - все объекты без тегов"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2754,5 +2773,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2761,5 +2780,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2767,5 +2786,5 @@
 "«или»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2773,5 +2792,5 @@
 "<b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2781,11 +2800,11 @@
 "дополнительный обратный слэш (вот так: <b>\\\"</b> и <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Используйте <b>(</b> и <b>)</b> для группировки выражений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2793,38 +2812,38 @@
 msgstr "Фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Принять фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Начать поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не найдено совпадений для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Ничего не найдено в выделенном, при поиске ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2832,5 +2851,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2838,5 +2857,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2844,5 +2863,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2860,5 +2879,15 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+"Ошибка синтаксического разбора регулярного выражения \"{0}\":\n"
+"{1}"
+
+#: ../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 ""
@@ -2866,10 +2895,5 @@
 "использования: ключ=значение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2878,36 +2902,36 @@
 "отношение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Неожиданный маркер. Ожидалось {0}, найдено {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неожиданный знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Пропущен параметр для OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Пропущен оператор для NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Ожидался id элемента"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Ожидалась последовательность чисел"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Ожидался ID пакета правок"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Ожидаемая версия"
@@ -2980,5 +3004,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3626,5 +3650,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3683,5 +3707,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3689,5 +3713,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3695,17 +3719,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Текст"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3713,5 +3731,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3720,5 +3738,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3726,5 +3744,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3732,5 +3750,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3738,43 +3756,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фильтр активен</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> объектов скрыто"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "Отключено редактирование <b>{0}</b> объектов."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Закройте диалог фильтра, если хотите увидеть все объекты.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Элемент с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "обнаружено id > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "обнаружена версия > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3785,5 +3803,5 @@
 "- {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3791,5 +3809,5 @@
 msgstr "Невозможно слияние, потому что часть элементов новые, а часть нет"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3859,55 +3877,55 @@
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Линия, обозначающая границу области, не замкнута."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Обнаружена больше чем одна линия \"from\" (откуда)"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Обнаружено больше одной линии \"до\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Найдено больше одного \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип участника для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Не найдена линия \"from\" (откуда)"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Не найдена линия \"до\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Не найдена точка или линия \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 "Линия \"from\" (от) не начинается или заканчивается на точке \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 "Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
@@ -3915,30 +3933,30 @@
 "\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 "Линия \"to\" (до) не начинается и не заканчивается на линии \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для ограничения {0} не найден."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стиль для внутренней линии ''{0}'' такой же, как у мультиполигона."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стиль для внешней линии ''{0}'' отсутствует."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Ошибка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3956,5 +3974,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
@@ -4559,6 +4577,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4573,4 +4591,5 @@
 msgstr "Правка"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4772,5 +4791,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5116,6 +5135,7 @@
 msgstr "Скопировать все чужие элементы в место назначения"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5127,5 +5147,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Вниз"
@@ -5479,6 +5499,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5491,6 +5511,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5856,6 +5876,5 @@
 msgstr "Открыть веб-страницу для выбранного пакета правок"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5879,5 +5898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5885,5 +5904,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5899,5 +5918,5 @@
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
-msgstr ""
+msgstr "Выбор объектов, которые содержатся в этой команде (кроме удалённых)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
@@ -5983,13 +6002,13 @@
 msgstr "Уладить конфликты для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Отфильтровать объекты и скрыть/отключить их."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5998,45 +6017,41 @@
 msgstr "Добавить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Добавить фильтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Редактировать фильтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Удалить фильтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Переместить фильтр вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Переместить фильтр вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Включить фильтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Скрыть элементы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Применить также для дочерних элементов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Инвертировать фильтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Режим фильтра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6256,17 +6271,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419
 msgid "Call editor for relation"
-msgstr ""
+msgstr "Запустить редактор отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420
 msgid "Call relation editor for selected relation"
-msgstr ""
+msgstr "Запустить редактор отношений для выделеного отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Выбрать в списке отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Выбрать отношение в списке отношений."
@@ -6624,4 +6639,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7927,5 +7943,5 @@
 msgstr "Неправильная URL запроса пакета правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7935,23 +7951,23 @@
 msgstr[2] "Это изменит {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Пустое значение удаляет тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7961,5 +7977,5 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7969,77 +7985,81 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Параметры/Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Участник"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr "Расположение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Удалить из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Выбрать отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Выберите отношение в основном выборе."
@@ -8779,4 +8799,5 @@
 msgstr "Запрос на сервер имён ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -9466,5 +9487,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Открыть диалог выбора файла"
@@ -10409,5 +10430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10440,17 +10461,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:890
 msgid "Download near:"
-msgstr ""
+msgstr "Загрузить возле:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "track only"
-msgstr ""
+msgstr "только трек"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "waypoints only"
-msgstr ""
+msgstr "только дорожные точки"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "track and waypoints"
-msgstr ""
+msgstr "треки и дорожные точки"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1017
@@ -10736,64 +10757,68 @@
 msgstr "Авто-Угадывание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr "Первая фотография соответствует первой точке gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Ручная регулировка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Переустановить позицию для: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Изображения с координатами местоположения в данных exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Помечено изображений ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Показать эскиз изображения на карте"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Часовой пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Сопоставить изображения с GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Установить соотношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Недопустимый часовой пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Недопустимое смещение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Попытаться снова"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Нет соответствующих изображений!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Нет выбранных gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10804,20 +10829,20 @@
 msgstr[2] "<html><b>{0}</b> из <b>{1}</b> фото соответствует треку GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовой пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минуты: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунды: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10827,5 +10852,5 @@
 msgstr[2] "(Расхождение во времени {0} дней)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10835,21 +10860,21 @@
 "можете вручную совместить фотографии с помощью движков."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Не удалось сопоставить фотографии треку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Настройка часового пояса и смещения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Выбранные фотографии не содержат информацию о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Фотографии не содержат информацию о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10858,17 +10883,17 @@
 "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX трек не содержит информации о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Необходимо выбрать трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Трек GPX не выделен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10879,5 +10904,5 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10930,14 +10955,14 @@
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Относятся к GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10947,5 +10972,5 @@
 msgstr[2] "Загружено {0} изображений."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10955,10 +10980,10 @@
 msgstr[2] "{0} найдено, помеченным GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Удалить изображение с диска"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10969,5 +10994,5 @@
 "утерян!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Невозможно удалить файл изображения."
@@ -11933,34 +11958,30 @@
 msgstr "Показать звуковые подсказки в реальном времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Создать не звуковые маркеры при обработке GPX данных"
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Точных путевых точек с правильными временными метками"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Точных путевых точек с приблизительным временем из позиции на треке"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Именованных точек трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Времён изменений (меток времени) звуковых файлов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Начала трека (всегда делать это, если другие метки недоступны)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Отобразить или спрятать меню работы со звуком на панели Главного меню"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11970,5 +11991,5 @@
 "проигрываемый в данный момент звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11978,23 +11999,16 @@
 "маркеров, а также их кнопок."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Автоматически создавать слой меток из путевых точек при открытии GPX слоя"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "При импортировании звука, создавать метки из..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 "Когда импортируется звук, применять его для любых путевых точек из слоя GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -12004,5 +12018,5 @@
 "точек) с именами или описаниями."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -12012,5 +12026,5 @@
 "изменения каждого импортированного звукового файла WAV."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -12020,18 +12034,18 @@
 "соответствующей кнопки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Время перемотки (секунд)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 "Показывает, во сколько раз увеличивается скорость при быстром проигрывании"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Множитель быстрого проигрывания"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -12041,13 +12055,13 @@
 "отрицательного) запрошенной позиции аудиозаписи"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Продолжительность вступления (в секундах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "Отношение времени диктофонной записи к истинно затраченому времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Калибровка звукозаписи"
@@ -12087,5 +12101,5 @@
 msgstr "Цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12096,22 +12110,22 @@
 msgstr "Все"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Локальные файлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Нет"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Отображать линии, даже если нет импортированых сегментов."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Отображать GPS большими точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -12119,9 +12133,9 @@
 "окружностью."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорость (красный = медленно, зелёный = быстро)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -12129,5 +12143,5 @@
 "имеются)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним цветом (может быть определено для именованных слоёв)"
@@ -12135,5 +12149,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12155,5 +12169,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12195,5 +12209,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12207,16 +12221,16 @@
 msgstr "Пешком"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Отображать стрелки направления"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Быстрая отрисовка (выглядит хуже)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12225,34 +12239,45 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Только в начале пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Отображать порядковые номера сегментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Отображать границы скачанных данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Отображать виртуальные точки в режиме выбора"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Отображать неактивные слои другим цветом"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Сглаженные линии (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr "Создавать маркеры, читая GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Автоматически создавать слой меток из путевых точек при открытии GPX слоя"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Рисовать линии между точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12262,9 +12287,9 @@
 "чтобы рисовать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальная длина для локальных файлов (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12273,20 +12298,20 @@
 "чтобы отображать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Максимальная длина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Отображать линии, даже если нет импортированой информации о линиях."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12295,5 +12320,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12301,13 +12326,13 @@
 msgstr "Не отображать стрелки, если они находятся близко от предыдущих стрелок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Минимальное расстояние (в пикселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Отображать точки GPS более жирно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12317,9 +12342,9 @@
 "Менеджере Слоев."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Цвета точек и сегментов треков по скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12329,46 +12354,46 @@
 "устройство захвата требует регистрации этой информации."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Раскрасить треки и точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Показывать направление на сегментах путей."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показывать порядковые номера на всех сегментах линии."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Применить сглаживание карты."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Отображать границы области, скачанной с сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Отображать неактивные слои данных другим цветом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Данные OSM"
@@ -12493,6 +12518,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Обновить модули"
@@ -13348,21 +13373,21 @@
 #, java-format
 msgid "Unknown requisite: {0}"
-msgstr ""
+msgstr "Неизвестный запрос: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
 msgid "Available roles"
-msgstr ""
+msgstr "Доступные роли"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 msgid "role"
-msgstr ""
+msgstr "роль"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "count"
-msgstr ""
+msgstr "количество"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
 msgid "elements"
-msgstr ""
+msgstr "элементы"
 
 #. space
@@ -13382,9 +13407,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 msgid "Preset role element without parent"
-msgstr ""
+msgstr "Заготовка элемента роли без родителей"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:748
 msgid "Preset sub element without parent"
-msgstr ""
+msgstr "Заготовка вложенного элемента без родителей"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
@@ -14768,10 +14793,15 @@
 "необходимо обновить JOSM, если вы хотите пользоваться этим модулем.</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "загрузка модуля ''{0}'' (версия {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14782,23 +14812,18 @@
 "''{1}'' не найден.<br>Удалить из настроек?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Загрузка модулей с сервера ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Проверка входных условий для модулей..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Загрузка модуля ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14807,5 +14832,5 @@
 msgstr[2] "JOSM не может найти информацию о следующих модулях:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14814,17 +14839,17 @@
 msgstr[2] "Модули не загружаются с сервера."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Определение модулей для загрузки с сервера..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Удаление нежелательных модулей..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Удаление неподдерживаемых модулей..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14833,5 +14858,5 @@
 msgstr[2] "Обновление следующих модулей не удалось:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14850,42 +14875,42 @@
 "обновить их вручную."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Обновление модуля не удалось"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Предупреждение: не удалось загрузить информационный лист моделей"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Отключить модуль"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Нажмите, чтобы удалить модуль ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Сохранить модуль"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Нажмите, чтобы сохранить модуль ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Предупреждение: не удалось удалить устаревший модуль ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14896,5 +14921,5 @@
 "Установка пропущена. JOSM ещё может загрузить старую версию модуля."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14905,10 +14930,10 @@
 "загруженного файла ''{1}''. Переименование не удалось."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Нажмите, чтобы отменить модуль ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14916,10 +14941,10 @@
 msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Согласно информации в модуле, автором является {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14928,9 +14953,9 @@
 "ошибке."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Отключить модуль?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14940,14 +14965,14 @@
 "модуль."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Информация о модуле"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "описание отсутствует"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -15368,5 +15393,5 @@
 "<br><br>Сообщение об ошибке:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -16729,34 +16754,35 @@
 msgstr "Ошибка кеширования зоны Ламберта"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Использовать"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Выберите тему для использования."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Цветовая схема"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Выберите тему для удаления."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Использовать выбранную тему из списка."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Использовать текущие цвета как новую цветовую тему."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Удалить выбранную тему из списка."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Цветовые схемы"
@@ -16832,5 +16858,5 @@
 msgstr "Слой для редактирования GPX треков"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Преобразовать в GPX слой с обезличенным временем"
@@ -16921,4 +16947,5 @@
 msgstr "Порт:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -18588,4 +18615,12 @@
 msgid "Terrace"
 msgstr "Ряд домов вдоль улицы"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr "Просмотр"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr "Просматривать карту, используя левую кнопку мыши"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -19837,26 +19872,26 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44
 msgid "Relation checker :"
-msgstr ""
+msgstr "Проверка отношений:"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45
 msgid "This plugin checks for errors in relations."
-msgstr ""
+msgstr "Этот модуль проверяет отношения на наличие ошибок."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115
 msgid "Relation type is unknown"
-msgstr ""
+msgstr "Неизвестный тип отношения"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145
 msgid "Relation is empty"
-msgstr ""
+msgstr "Пустое отношение"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155
 msgid "<empty>"
-msgstr ""
+msgstr "<пусто>"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163
 #, java-format
 msgid "Role {0} missing"
-msgstr ""
+msgstr "Отсутствует роль {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164
@@ -19867,29 +19902,29 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201
 msgid "Role verification problem"
-msgstr ""
+msgstr "Проблема проверки роли"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169
 #, java-format
 msgid "Number of {0} roles too low ({1})"
-msgstr ""
+msgstr "Номер роли {0} слишком маленький ({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 "Номер роли {0} слишком большой ({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 "Неверный тип участника роли {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194
 #, java-format
 msgid "Role {0} unknown"
-msgstr ""
+msgstr "Неизвестная роль {0}"
 
 #: ../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
@@ -19960,17 +19995,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
 msgid "Tag value contains character with code less than 0x20"
-msgstr ""
+msgstr "Значение тега содержит символ с кодом меньше чем 0x20"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:498
 msgid "Tag key contains character with code less than 0x20"
-msgstr ""
+msgstr "Ключ тега содержит символ с кодом меньше чем 0x20"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:504
 msgid "Tag value longer than allowed"
-msgstr ""
+msgstr "Значение тега длиннее, чем разрешено"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510
 msgid "Tag key longer than allowed"
-msgstr ""
+msgstr "Ключ тега длиннее, чем разрешено"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:516
@@ -20294,5 +20329,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr "Показывает текущее положение для видеофрагмента"
@@ -20699,9 +20734,6 @@
 msgstr "Файлы WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20712,10 +20744,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "На базе данных ведутся работы, и она недоступна"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20725,16 +20757,16 @@
 "Уменьшите область, либо воспользуйтесь planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "не может получить аудио поток из введенного URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Аудиоустройство недоступно"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
@@ -20742,10 +20774,10 @@
 "сервер"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr "адм. центр"
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20756,14 +20788,14 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "лесопосадки"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr "сельскохозяйственные земли"
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20849,5 +20881,5 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20861,7 +20893,7 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
-msgstr ""
+msgstr "мультиполигон"
 
 #. relation type
@@ -20938,5 +20970,5 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20946,62 +20978,63 @@
 msgstr "маршрут"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Дополнительные атрибуты:"
-
+msgstr "Атрибуты"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Модификаторы:"
-
+msgstr "Изменено"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Имя файла"
-
+msgstr "Имя файла:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Ступени через ограду"
-
+msgstr "Размер"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Виды топлива:"
-
+msgstr "Файлы типа:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Домашняя страница"
-
+msgstr "Домашняя папка"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "даосизм"
-
+msgstr "Список"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Увеличить масштаб"
-
+msgstr "Искать в:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Новая роль"
-
+msgstr "Новая папка"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Создать новую точку"
-
+msgstr "Создать новую папку"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Сохранить"
-
+msgstr "Сохранить в:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
-msgstr ""
+msgstr "Вверх на один уровень"
 
 #. Plugin AddrInterpolation
@@ -21276,6 +21309,16 @@
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+"Предоставляет вспомогательную клавишу, которая помогает работать с "
+"однокнопочной мышью (стилусом). Сейчас доступна лишь одна дополнительная "
+"клавиша для перетягивания карты."
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21286,5 +21329,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21295,10 +21338,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21310,5 +21353,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21321,5 +21364,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21330,15 +21373,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Выделить последовательность неветвящихся соединённых линий"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21350,5 +21393,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -29395,5 +29438,5 @@
 #: build/trans_presets.java:3203
 msgid "Boundary"
-msgstr ""
+msgstr "Граница"
 
 #. item "Relations/Boundary"
@@ -29404,5 +29447,5 @@
 #: build/trans_presets.java:3208
 msgid "Edit Boundary"
-msgstr ""
+msgstr "Свойства границы"
 
 #. item "Relations/Boundary" text "Name"
@@ -29410,36 +29453,36 @@
 #: build/trans_presets.java:3212
 msgid "Boundary type"
-msgstr ""
+msgstr "Тип границы"
 
 #. item "Relations/Boundary" combo "Boundary type"
 #: build/trans_presets.java:3212
 msgid "administrative"
-msgstr ""
+msgstr "административная"
 
 #: build/trans_presets.java:3212
 msgid "national"
-msgstr ""
+msgstr "национальная"
 
 #: build/trans_presets.java:3212
 msgid "civil"
-msgstr ""
+msgstr "общины"
 
 #: build/trans_presets.java:3212
 msgid "political"
-msgstr ""
+msgstr "политическая"
 
 #: build/trans_presets.java:3213
 msgid "Administrative level"
-msgstr ""
+msgstr "Административный уровень"
 
 #. item "Relations/Boundary" role "inner segment"
 #: build/trans_presets.java:3218
 msgid "Sub area"
-msgstr ""
+msgstr "Подчиненная территория"
 
 #. item "Relations/Boundary" role "Sub area"
 #: build/trans_presets.java:3219
 msgid "Administration centre"
-msgstr ""
+msgstr "Административный центр"
 
 #. item "Relations/Boundary" role "Administration centre"
@@ -34325,4 +34368,7 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Импортировать файл TCX..."
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Создать не звуковые маркеры при обработке GPX данных"
 
 #~ msgid "error requesting update"
@@ -34749,4 +34795,7 @@
 #~ msgstr "Открыть изображения через AgPifoJ..."
 
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!"
+
 #~ msgid "Conflicts in data"
 #~ msgstr "Конфликт в данных"
@@ -34948,4 +34997,7 @@
 #~ "видно) могут использовать их.<br> Вы действительно хотите удалить эти "
 #~ "точки?"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Ошибка во время скачивания"
 
 #~ msgid "Upload to OSM API failed"
@@ -35543,4 +35595,7 @@
 #~ "линию; объединить полигоны; перейти в указанную точку."
 
+#~ msgid "Apply also for children"
+#~ msgstr "Применить также для дочерних элементов"
+
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
@@ -35666,4 +35721,8 @@
 #~ "объекта с внешним id {1} и внутренним id {2}"
 
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
 #~ msgid "Node {0} cannot be added to the way because it was deleted"
 #~ msgstr ""
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 21603)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
 "PO-Revision-Date: 2010-06-01 19:23+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\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-02 08:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -98,5 +98,6 @@
 #: ../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
@@ -240,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +264,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -317,9 +318,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
@@ -342,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
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -648,12 +649,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -885,5 +886,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
+msgstr ""
+"Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
@@ -1100,5 +1102,6 @@
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
-msgstr "Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
+msgstr ""
+"Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
@@ -1466,5 +1469,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1485,5 +1489,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1635,5 +1639,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku "
@@ -1657,5 +1662,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1805,6 +1810,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
@@ -1873,5 +1878,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
@@ -1946,9 +1952,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 +1971,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2258,7 +2264,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Chyby v priebehu sťahovania"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Chyby počas sťahovania"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2294,7 +2300,7 @@
 msgstr "({0}/{1}) Nahrávam rodičovské z relácie {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Chyby počas sťahovania"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2430,6 +2436,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ý "
@@ -2557,114 +2563,114 @@
 msgstr "<end-of-file>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Vyhľadávať..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Vyhľadávať objekty"
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Prosím vložte vybraný reťazec"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Zadajte hladaný reťazec."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Vložte hľadaný výraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "nahradiť označené"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "pridať k výberu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "odobrať z výberu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "Hľadať vo výbere"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "veľkosť písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regulárny výraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - ''Baker'' a ''Street'' v akomkoľvek kľúči, alebo mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - ''Baker Street'' v akomkoľvek kľúči, alebo mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' kdekoľvek v mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=cesta</b> - kľúč ''type'' s presnou hodnotou ''cesta''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<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:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - neobsahuje ''Bak'' v mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 or on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - klúč 'foot' nastavený na akúkoľvek hodnotu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Špeciálne ciele:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b> - typy objektov (<b>bod</b>, <b>cesta</b>, <b>vzťah(relácia)</"
-"b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+"<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:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - všetky objekty nahraté užívateľom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>užívateľ:anonymný</b> - všetky objekty zmenené anonymnými užívateľmi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt s určeným ID (0 pre nové objekty)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2673,5 +2679,5 @@
 "<b>verzia:</b>... - objekt s danou verziou (0 objektov bez priradenej verzie)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2681,13 +2687,13 @@
 "priradeného súboru zmien)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
 msgstr ""
 "<b>body:</b>... - objekt s danými číslami bodov (body:počet alebo body:min-"
 "max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2697,5 +2703,9 @@
 "alebo značky:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2705,26 +2715,26 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> alebo <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všetky zmenené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všetky vybraté objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - všetky nekompletné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všetky neoznačené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>dieťa <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2732,27 +2742,28 @@
 "<b>rodič <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použite <b>|</b> alebo <b>OR</b> pri kombinácii s logickým \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "Použite <b>\"</b> operátor citovania (e.g. ak kľúč obsahuje <b>:</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+msgstr ""
+"Použite <b>\"</b> operátor citovania (e.g. ak kľúč obsahuje <b>:</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
 "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>)."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+"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:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2760,38 +2771,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Predložiť filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Začať vyhľadávanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Neboli nájdené záznamy pre \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2799,5 +2810,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2805,5 +2816,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2811,5 +2822,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2827,5 +2838,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2833,10 +2852,5 @@
 "použitia: kľúč=hodnota"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2844,36 +2858,36 @@
 "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Neočakávaný symbol. Očakávaný {0}, vytvorený {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočakávaná značka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Chýbajúci parameter pre OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Chýbajúci operator pre NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Očakávané ID pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Očakávaný rozsah čísel"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Očakávané ID zmenového súboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Očakávaná verzia"
@@ -2920,6 +2934,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>"
 
@@ -2944,5 +2958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3084,5 +3098,6 @@
 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
@@ -3160,11 +3175,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:459
@@ -3446,9 +3461,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
@@ -3540,5 +3555,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3547,5 +3562,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3554,5 +3569,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3587,7 +3602,8 @@
 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é"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+msgstr ""
+"Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3646,5 +3662,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3652,5 +3668,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3658,17 +3674,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Text"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3676,5 +3686,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3683,5 +3693,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3689,5 +3699,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3695,5 +3705,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3701,43 +3711,43 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Aktívny filter</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> skryté objekty"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> vypnuté objekty"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 "</p><p>Zatvorte dialóg filtra, aby sa zobrazili všetky objekty.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 očakávané. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "verzia > 0 očakávaná. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3748,5 +3758,5 @@
 "zmenového súboru je {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3756,9 +3766,10 @@
 "ostatné nie sú"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, 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
@@ -3815,5 +3826,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "Nemôžem porovnať pôvodné s ID ''{0}'' s pôvodným s ID ''{1}''."
 
@@ -3823,81 +3835,81 @@
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Najdené viac cieľových \"to\" ciest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámy typ člena pre ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Chyba: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4073,5 +4085,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>Nemôžem čítať záložky z<br>''{0}''<br>Chyba bola: {1}</html>"
 
@@ -4143,5 +4156,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4151,5 +4164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4158,5 +4171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4165,5 +4178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4172,5 +4185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4179,5 +4192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4186,9 +4199,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4508,5 +4521,6 @@
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
+msgstr ""
+"Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
@@ -4515,6 +4529,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4529,4 +4543,5 @@
 msgstr "Upraviť"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4696,6 +4711,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
@@ -4728,5 +4743,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4767,6 +4782,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 "
@@ -4802,5 +4817,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"
@@ -4809,5 +4824,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"
@@ -4816,5 +4831,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"
@@ -5044,5 +5059,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
@@ -5072,6 +5088,7 @@
 msgstr "Kopírovať všetky ich (their) prvky do cieľa"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5083,5 +5100,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Dole"
@@ -5126,6 +5143,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 "
@@ -5135,9 +5152,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
@@ -5187,11 +5204,12 @@
 #: ../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>"
@@ -5379,6 +5397,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
@@ -5428,6 +5446,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5440,6 +5458,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5680,5 +5698,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5691,6 +5710,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
@@ -5741,6 +5760,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
@@ -5758,11 +5777,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
@@ -5786,5 +5805,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr "Stiahnuť informácie a vybratých zmenových súboroch z OSM servera"
 
@@ -5802,6 +5822,5 @@
 msgstr "Otvoriť webovú stránku pre každý vybratý zmenový súbor"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5821,9 +5840,10 @@
 #: ../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
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5831,5 +5851,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5906,15 +5926,17 @@
 #, 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
@@ -5931,13 +5953,13 @@
 msgstr "Rozhodnúť konflikt pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrovať objekty a schovať/vypnúť ich."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5946,45 +5968,41 @@
 msgstr "Pridať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Pridať filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Upraviť filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Zmazať filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Posunúť filter hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Posunúť filter dole."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Zapnúť filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Schovať prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Uplatniť tiež pre deti(children)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Obrátený filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Režim filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6211,10 +6229,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Vybrať v obsahu relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Vybrať reláciu v obsahu relácií."
@@ -6376,5 +6394,6 @@
 #: ../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
@@ -6575,4 +6594,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7606,5 +7626,6 @@
 #, 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
@@ -7712,9 +7733,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
@@ -7741,13 +7762,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
@@ -7875,5 +7896,5 @@
 msgstr "Táto požiadavka URL na zmenové súbory je chybná"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7883,23 +7904,23 @@
 msgstr[2] "Toto chce zmeniť {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Prázdna hodnota vymaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7909,5 +7930,5 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7917,77 +7938,81 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Vybrať reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Vybrať reláciu v hlavnom výbere."
@@ -8055,5 +8080,6 @@
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
+"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93
@@ -8109,6 +8135,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ú "
@@ -8129,10 +8155,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
@@ -8180,5 +8206,6 @@
 #: ../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"));
@@ -8296,12 +8323,13 @@
 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 "
@@ -8421,5 +8449,6 @@
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr ""
+"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -8647,10 +8676,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je umožnený."
-"<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba.</"
-"html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
+msgstr ""
+"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je "
+"umožnený.<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, "
+"alebo oba.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8709,4 +8739,5 @@
 msgstr "Pýtam sa na meno servera ..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8789,14 +8820,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
@@ -8805,11 +8836,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
@@ -8938,5 +8969,6 @@
 "Failed to set current primitive. Current version {0} not available in "
 "history."
-msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
+msgstr ""
+"chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
@@ -9002,6 +9034,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
@@ -9096,15 +9128,16 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Aktualizácia <strong>neúspešná</strong> pretože server ná novú verziu "
 "jednu z<br>vaších bodov, ciest, alebo relácií.<br>Konflikt je zapríčinený "
-"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu {2},"
-"vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu iba "
-"sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu celej "
-"lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
+"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu "
+"{2},vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu "
+"iba sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu "
+"celej lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
 "zrušenie a pokračovanie v editácii.<br></html>"
 
@@ -9119,12 +9152,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
-"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click <strong>{0}</"
-"strong>pre synchronizáciu celej lokálnej dátovej sady so serverom.<br>Click "
-"<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
+"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click "
+"<strong>{0}</strong>pre synchronizáciu celej lokálnej dátovej sady so "
+"serverom.<br>Click <strong>{1}</strong> pre zrušenie a pokračovanie v "
+"editácii.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9383,5 +9418,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
@@ -9398,5 +9433,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr "Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté na server."
 
@@ -9490,18 +9526,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
@@ -9513,6 +9549,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 "
@@ -9562,5 +9598,6 @@
 #: ../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
@@ -9570,5 +9607,6 @@
 #: ../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
@@ -9732,5 +9770,6 @@
 #: ../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
@@ -9756,5 +9795,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9784,5 +9823,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr "Zmenový súbor bude <strong>zavretý</strong> po tomto nahratí"
 
@@ -9802,12 +9842,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
@@ -9820,12 +9860,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
@@ -9835,6 +9875,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
@@ -9851,12 +9891,13 @@
 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 "
@@ -9917,7 +9958,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 "
@@ -9931,5 +9972,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9957,5 +9998,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
@@ -10027,5 +10069,6 @@
 #: ../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
@@ -10191,7 +10234,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 "
@@ -10219,7 +10262,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 "
@@ -10288,6 +10331,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
@@ -10303,5 +10346,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10354,6 +10397,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:1126
@@ -10487,6 +10530,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 "
@@ -10553,11 +10596,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
@@ -10618,6 +10661,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
@@ -10625,64 +10668,68 @@
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Manuálne nastavenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Prednastaviť pozíciu pre: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Obrázky so zemepisnou polohou v exif dátach ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Obrázky, ktoré sú už označkované ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Zobraziť miniatúry obrázkov na mape"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Vyrovnať(Offset):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Zladiť obrázky s GPX stopou(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Zladiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Neplatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Neplatné vyrovnanie (offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Skúsiť znovu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Žiadne obrázky nemôžu byť vyrovnané!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "Žiadny gpx nie je vybratý"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10696,20 +10743,20 @@
 "<html>Vyrovnané <b>{0}</b> z <b>{1}</b> fotografie do GPX stopy.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časové pásmo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minút: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekúnd: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10719,5 +10766,5 @@
 msgstr[2] "Časová odchýlka z {0} dní"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10727,21 +10774,21 @@
 "posúvač ručne na fotky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Nastaviť časové pásmo a vyváženie(offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Vybraté fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10749,17 +10796,17 @@
 msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX Stopa nemá informáciu o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Môžete vybrať GPX stopu(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Nevybratá GPX stopa(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10770,5 +10817,5 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10821,14 +10868,14 @@
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10838,5 +10885,5 @@
 msgstr[2] "{0} načítaných obrázkov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10846,10 +10893,10 @@
 msgstr[2] "{0} boli založené GPS značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Vymazať súbor s obrázkom z disku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10860,5 +10907,5 @@
 "stratený!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Súbor s obrázkom nemôže byť zmazaný."
@@ -11048,5 +11095,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
+msgstr ""
+"Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
@@ -11064,5 +11112,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
 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
@@ -11102,7 +11151,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
@@ -11167,6 +11216,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 "
@@ -11199,8 +11248,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 </ "
@@ -11333,6 +11382,7 @@
 "<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
@@ -11340,11 +11390,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
@@ -11463,5 +11513,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 "Nepodarilo sa overiť užívateľa ''{0}'' s heslom''***'' ako užívateľa OAuth"
@@ -11502,5 +11553,6 @@
 #: ../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
@@ -11538,5 +11590,6 @@
 #: ../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
@@ -11562,5 +11615,6 @@
 #, 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
@@ -11601,8 +11655,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ú "
@@ -11705,8 +11759,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> "
@@ -11744,7 +11798,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> "
@@ -11818,34 +11872,30 @@
 msgstr "Zobraziť prehrávanú(live) zvukovú stopu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Vytvoriť bez zvukovej značky pri čítaní GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Podrobné body cesty(waypoints) s platnou časovou značkou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Podrobné body cesty s časom odhadovaným z pozície stopy(track)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Pomenované trasové body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Zmenené časy (časových značiek) zvukových súborov."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Začiatok stopy (bude použité vždy ak nie sú dostupné iné značky)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Zobraziť alebo skryť menu Zvuk v menu hlavnej ponuky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11855,5 +11905,5 @@
 "sa práve prehráva vaša nahrávka."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11863,22 +11913,15 @@
 "ikony."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Pri importe zvuku urobiť značky z..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Pri importe zvuku používam záznam na značky v GPX vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11888,5 +11931,5 @@
 "podrobné body cesty) s menami a popismi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11896,5 +11939,5 @@
 "uloženia každého zvukové WAV súboru."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11903,17 +11946,17 @@
 "Skok v sekundách dopredu, alebo dozadu, podľa stlačeného náležitého tlačítka."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Skok Dopredu/vzad (sekundy)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Číslo, ktorým je násobená rýchlosť pretáčania."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Rýchle pretáčanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11923,14 +11966,14 @@
 "pri zápornom čísle), ako je požadované."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Uvedený čas (sekundy)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 "Časový posun medzi spustením nahrávania a skutočným začiatkom nahrávania."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Kalibrácia zvukového nahrávania"
@@ -11970,5 +12013,5 @@
 msgstr "Farby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11979,34 +12022,34 @@
 msgstr "Všetko"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Miestne súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Žiadny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Zosilniť líniu, ak žiadne segmenty nie su naimportované."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Kresliť väčšie GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "Kresliť kruh z HDOP hodnoty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rýchlosť (červená = pomaly, zelená = rýchlo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
@@ -12014,5 +12057,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12034,5 +12077,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12074,5 +12117,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12086,50 +12129,61 @@
 msgstr "Pešo"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Kresliť šípky v smere jazdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Rýchle vykresľovanie (vypadá nepekne)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Iba dôležité smery (napr. jednosmerka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Iba na začiatku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Vykresliť segmenty s poradovými číslami"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykresliť ohraničujúci box stiahnutých dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykresľovať virtuálne body v mode výberu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhladené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Kresliť čiary medzi raw GPS bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12139,9 +12193,9 @@
 "1'' pre kresbu všetkých čiar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Maximálna dĺžka pre lokálne súbory (v metroch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12150,10 +12204,10 @@
 "kreslenie všetkých línií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximálna dĺžka (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12162,11 +12216,12 @@
 "čiarach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Nakreslite smerové šípky použijúc vyhľadávajúcu tabuľku namiesto "
@@ -12174,5 +12229,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12180,13 +12235,13 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimálna vzdialenosť (pixelov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12196,9 +12251,9 @@
 "v  manažéri vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12208,5 +12263,5 @@
 "pre digitalizáciu musia zaznamenať informácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12214,43 +12269,45 @@
 "rýchlostí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Farebná trať a body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Kresliť smer cestného segmentu"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovať hranice dát stiahnutých zo servera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "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
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovať neaktívne vrstvy dát inou farbou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM údaje"
@@ -12322,5 +12379,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -12374,6 +12432,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Aktualizovať pluginy"
@@ -12455,6 +12513,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é "
@@ -12471,9 +12529,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 "
@@ -12786,6 +12844,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 "
@@ -12918,6 +12976,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> "
@@ -12943,6 +13001,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 "
@@ -13036,5 +13094,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 "Varovanie: Nepodarilo sa získať OAuth autorizovaný prístup z poverovacieho "
@@ -13056,6 +13115,8 @@
 
 #: ../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
@@ -13154,9 +13215,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
@@ -13404,6 +13465,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
@@ -13419,5 +13480,6 @@
 #, 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
@@ -13474,5 +13536,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
@@ -13665,5 +13727,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "Žiadne pôvodné s id {0}  v miestnom dátovom súbore. Nemožno vyvodzovať "
@@ -14048,5 +14111,6 @@
 #: ../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
@@ -14075,9 +14139,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
@@ -14104,9 +14168,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
@@ -14149,5 +14213,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
@@ -14619,16 +14684,21 @@
 #, 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> "
 "Musíte aktualizovať JOSM, aby využil tento plugin. </ Html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "nahrávanie pluginu ''{0}'' (verzia {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14639,23 +14709,18 @@
 "nebol nájdený. <br> Odstrániť z nastavení?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Načítavam pluginy ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Kontrolujem predpoklady pluginov ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Nahrávam pluginy ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14664,5 +14729,5 @@
 msgstr[2] "JOSM nemohol nájsť informácie o nasledujúcich pluginoch:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14671,17 +14736,17 @@
 msgstr[2] "Pluginy nebudú nahraté."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Zisťujem pluginy pre nahratie ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Odstraňujem odmietané pluginy ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Odstraňujem neudržiavané pluginy ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14690,5 +14755,5 @@
 msgstr[2] "Aktualizácia týchto pluginov zlyhala:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14707,42 +14772,42 @@
 "aktualizovať ručne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Aktualizácia pluginu zlyhala"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Varovanie: Nepodarilo sa stiahnuť informáčný zoznam pluginov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Vypnúť doplnok"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Kliknite na tlačidlo zmazať plugin ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Zachovať plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Kliknite pre zachovanie pluginu ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Varovanie: Nepodarilo sa odstránenie zastaraných pluginov ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14753,5 +14818,5 @@
 "Vynechávam inštaláciu. JOSM stále používa starú verziu pluginu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14762,22 +14827,22 @@
 "súboru ''{1}''. Premenovanie zlyhalo."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Kliknite na tlačidlo vypnúť plugin ''{0}''"
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Podľa informácie v doplnku jeho autorom je ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14785,9 +14850,9 @@
 "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Vypnúť doplnok?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14797,14 +14862,14 @@
 "prestal používať."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Informácia o pluginoch"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "Popis nedostupný"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14848,5 +14913,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Upozornenie: Nepodaril sa scan súboru ''{0}'' pre informácie o pluginoch. "
@@ -14914,5 +14980,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"
@@ -14986,7 +15052,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
@@ -15018,17 +15084,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> "
@@ -15039,7 +15105,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 "
@@ -15049,8 +15115,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 "
@@ -15075,7 +15141,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> "
@@ -15142,6 +15208,7 @@
 "check your internet connection.</html>"
 msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
-"<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
+"<html>Neúspešné otváranie a pripájanie na  vzdialený "
+"server<br>''{0}''.<br>Prosím, skontrolujte vaše internetové "
+"pripojenie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -15166,6 +15233,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 "<html>OSM server<br>''{0}''<br>hlási vnútornú chybu serveru.<br>Toto je "
@@ -15179,7 +15247,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 "
@@ -15212,7 +15280,8 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
-"<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. <br>Prosím skontrolujte API "
-"URL vo vašich nastaveniach a vaše internetové pripojenie.</html>"
+"<html>Neúspešné otváranie a pripájanie na  vzdialený "
+"server<br>''{0}''.<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. "
+"<br>Prosím skontrolujte API URL vo vašich nastaveniach a vaše internetové "
+"pripojenie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -15221,13 +15290,13 @@
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<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:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15652,5 +15721,6 @@
 #: ../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
@@ -15933,7 +16003,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15943,5 +16013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15951,5 +16021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15965,5 +16035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15973,5 +16043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16002,5 +16072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16009,5 +16079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16016,5 +16086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16023,5 +16093,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16030,5 +16100,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16037,5 +16107,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -16069,14 +16139,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-"Špeciálny manipulant pre francúzsky kataster wms at www.cadastre.gouv."
-"fr<BR><BR>Prosím čítajte Podmienky pre využívanie (francúzsky): <br><a href="
-"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
+msgstr ""
+"Špeciálny manipulant pre francúzsky kataster wms at "
+"www.cadastre.gouv.fr<BR><BR>Prosím čítajte Podmienky pre využívanie "
+"(francúzsky): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
 "<BR>predtým, ako nahráte nejaké dáta vytvorené  týmto pluginom."
@@ -16088,5 +16161,6 @@
 #: ../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
@@ -16239,6 +16313,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
@@ -16389,6 +16463,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
@@ -16588,34 +16662,35 @@
 msgstr "Cache chýb v Lambert Zóne"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Použiť"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Prisím vyberte schému k použitiu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Farebná schéma"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Vyberte schému pre zmazanie."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Použiť vybratú schému zo zoznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Použiť súčasné farby ako novú farebnú schému."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Zmazať vybranú schému zo zoznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Farebná schéma"
@@ -16690,5 +16765,5 @@
 msgstr "Vrstva na úoravu GPX stôp(tracks)"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertovať do GPX vrstvy s neznámym časom"
@@ -16779,4 +16854,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16989,5 +17065,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17108,5 +17184,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250."
@@ -17130,10 +17207,11 @@
 #: ../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 ""
-"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v stupňoch."
-"<br>Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. Štandardne "
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
 "0.0003."
+msgstr ""
+"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v "
+"stupňoch.<br>Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. "
+"Štandardne 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -17448,5 +17526,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec"
@@ -17561,5 +17640,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr "Máte neuložené zmeny vo vašej fronte. Prajete si ich odoslať teraz?"
 
@@ -17611,5 +17691,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr "Napíšte informáciu o polohe do hlavičky Exif nasledujúcich súborov:"
 
@@ -18432,4 +18513,12 @@
 msgid "Terrace"
 msgstr "Rad (Terrace)"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -18916,9 +19005,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
@@ -18976,6 +19065,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
@@ -19012,8 +19101,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 "
@@ -19075,15 +19164,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
@@ -19100,5 +19189,6 @@
 #: ../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
@@ -19208,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 ""
 "Zákaz odbočenia používa body OSM <span class=\"object-name\">{0}</span> ako "
@@ -19217,6 +19307,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> "
@@ -19731,5 +19821,6 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr "Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
+msgstr ""
+"Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
@@ -19741,5 +19832,6 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
+msgstr ""
+"Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:157
@@ -19871,10 +19963,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"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:744
@@ -20022,5 +20115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -20074,5 +20167,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 "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
@@ -20121,5 +20215,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -20187,6 +20281,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
@@ -20336,5 +20430,6 @@
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
 "settings."
-msgstr "Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
+msgstr ""
+"Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
@@ -20387,6 +20482,6 @@
 "<html>Základ URL<br>''{0}''<br>pre túto WMS vrstvu neobsahuje na konci "
 "žiadnu z ''&'' ani s ''?''.<br>Toto pravdepodobne vedie k chybnej WMS "
-"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie preferencií."
-"<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
+"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie "
+"preferencií.<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
@@ -20520,9 +20615,6 @@
 msgstr "WMS Súbory (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20533,10 +20625,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Databáza je mimo prevádzky kvôli údržbe"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20547,25 +20639,25 @@
 "planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "nemôžem získať zvuk zo vstupu URL"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Audio zariadenie nedostupné"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "Musíte urobiť vaše zmeny verejnými pre nahratie nových dát"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20573,17 +20665,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "les"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20591,7 +20683,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20601,5 +20693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20642,5 +20734,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20650,5 +20742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20658,5 +20750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20666,8 +20758,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20681,5 +20773,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -20690,5 +20782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20697,7 +20789,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20707,5 +20799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20715,5 +20807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20723,5 +20815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20731,5 +20823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20739,5 +20831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20747,5 +20839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20755,8 +20847,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20766,59 +20858,60 @@
 msgstr "trasa (route)"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Voliteľné atribúty:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Modifikátory:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Meno súboru"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Turniket (Stile)"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Typy palív"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Domovská stránka"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoisti"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Priblížiť"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nová funkcia"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Vytvoriť nový bod."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Uložiť"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -20854,6 +20947,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
@@ -20866,5 +20959,6 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr "Vytvorenie a správa adresných bodov a budov vrámci  Českej Republiky."
+msgstr ""
+"Vytvorenie a správa adresných bodov a budov vrámci  Českej Republiky."
 
 #. Plugin dataimport
@@ -20898,5 +20992,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a  priamo do JOSM."
 
@@ -21089,6 +21184,13 @@
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21099,5 +21201,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21106,10 +21208,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21121,5 +21223,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21129,5 +21231,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21138,5 +21240,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21144,10 +21246,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 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:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21158,5 +21260,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22048,7 +22150,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -22188,8 +22290,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"/>
@@ -22399,5 +22501,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22407,5 +22509,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22424,5 +22526,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22432,5 +22534,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22449,5 +22551,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22457,5 +22559,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22474,5 +22576,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22482,5 +22584,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22495,5 +22597,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22511,5 +22613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22527,5 +22629,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22534,5 +22636,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22542,5 +22644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22560,5 +22662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22567,5 +22669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22575,5 +22677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -23245,5 +23347,6 @@
 #: 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"
@@ -23282,5 +23385,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -23331,5 +23434,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -23418,5 +23521,6 @@
 #: 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"
@@ -23428,5 +23532,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23594,5 +23698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -23926,5 +24030,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23934,5 +24038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23942,5 +24046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23950,5 +24054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23958,5 +24062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23966,5 +24070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23974,5 +24078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23983,5 +24087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25402,5 +25506,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25410,5 +25514,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25418,5 +25522,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25426,5 +25530,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25788,7 +25892,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25798,5 +25902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25806,5 +25910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25814,5 +25918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25822,5 +25926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25830,5 +25934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25838,5 +25942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25846,5 +25950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25854,5 +25958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25862,5 +25966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25870,5 +25974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25878,5 +25982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25886,5 +25990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25894,5 +25998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25902,5 +26006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25910,5 +26014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25918,5 +26022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25926,5 +26030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25934,5 +26038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25942,5 +26046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25950,5 +26054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25958,5 +26062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25966,5 +26070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25974,5 +26078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25982,5 +26086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25990,5 +26094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25998,5 +26102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26006,5 +26110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26014,5 +26118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26022,5 +26126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26030,5 +26134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26038,5 +26142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26046,5 +26150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26054,5 +26158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26062,5 +26166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26070,5 +26174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26078,5 +26182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26086,5 +26190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26094,5 +26198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26102,5 +26206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26110,5 +26214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26118,5 +26222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26126,5 +26230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26134,5 +26238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26142,5 +26246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26150,5 +26254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26158,5 +26262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27866,7 +27970,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27876,5 +27980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27884,5 +27988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27892,5 +27996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27900,5 +28004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27908,5 +28012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27916,5 +28020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27924,5 +28028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27932,5 +28036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -29354,5 +29458,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29368,5 +29472,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29376,5 +29480,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -29385,5 +29489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29396,7 +29500,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29406,5 +29510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29414,5 +29518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29422,5 +29526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29430,5 +29534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29462,5 +29566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29476,5 +29580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29484,5 +29588,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29491,5 +29595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29499,5 +29603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29508,5 +29612,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29531,5 +29635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29644,9 +29748,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
@@ -29654,5 +29758,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,
@@ -29662,8 +29766,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
@@ -29677,5 +29781,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29683,5 +29787,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29730,6 +29834,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>
@@ -29809,5 +29913,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29817,11 +29921,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29837,5 +29941,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29844,5 +29948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29851,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29865,5 +29969,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29877,5 +29981,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29884,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29891,5 +29995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29898,5 +30002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29905,5 +30009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29912,5 +30016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29919,5 +30023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29926,5 +30030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29933,5 +30037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29940,5 +30044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29947,5 +30051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29954,5 +30058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29961,5 +30065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29968,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -29975,5 +30079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -30150,7 +30254,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30164,5 +30268,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30172,7 +30276,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30182,5 +30286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30190,5 +30294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30198,5 +30302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30206,5 +30310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -30220,5 +30324,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30227,5 +30331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30235,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30242,5 +30346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30249,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30256,5 +30360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30263,5 +30367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30270,5 +30374,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30277,5 +30381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30284,5 +30388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30291,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30298,5 +30402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -30310,5 +30414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -30322,5 +30426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30329,5 +30433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -30341,5 +30445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -30354,5 +30458,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -30367,5 +30471,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -30379,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -30391,5 +30495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30398,5 +30502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30405,5 +30509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30413,5 +30517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30420,5 +30524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30427,5 +30531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30434,5 +30538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30442,5 +30546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30451,5 +30555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30459,7 +30563,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30469,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30477,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30485,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30494,5 +30598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30501,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30509,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30517,5 +30621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30525,5 +30629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30533,5 +30637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30541,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30549,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30557,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30565,5 +30669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30573,5 +30677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30594,5 +30698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30607,7 +30711,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30617,5 +30721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30624,5 +30728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30632,5 +30736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30639,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30647,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30655,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30669,5 +30773,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30678,5 +30782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30695,5 +30799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30703,5 +30807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30714,5 +30818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30731,5 +30835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30738,5 +30842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30745,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30752,7 +30856,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30763,5 +30867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30776,5 +30880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30788,5 +30892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30796,5 +30900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30808,5 +30912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30820,5 +30924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30827,5 +30931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30834,7 +30938,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30844,5 +30948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30852,5 +30956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30860,5 +30964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30868,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30876,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30890,7 +30994,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -30905,5 +31009,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -30918,5 +31022,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -30931,5 +31035,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -30944,5 +31048,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -30957,5 +31061,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -30970,7 +31074,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30980,5 +31084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30987,5 +31091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30995,5 +31099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31003,5 +31107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31011,5 +31115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31019,5 +31123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31027,5 +31131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31035,5 +31139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31043,5 +31147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31051,5 +31155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31059,5 +31163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31067,5 +31171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31075,5 +31179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -31093,5 +31197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -31106,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -31117,7 +31221,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31127,5 +31231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31135,5 +31239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31143,5 +31247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31151,5 +31255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31159,5 +31263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31167,5 +31271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31175,5 +31279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31183,5 +31287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31191,5 +31295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31199,5 +31303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31207,5 +31311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31215,5 +31319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31223,5 +31327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31231,5 +31335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31239,5 +31343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31247,5 +31351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -31267,5 +31371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -31279,7 +31383,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31289,5 +31393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31297,5 +31401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31305,5 +31409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31313,5 +31417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31321,5 +31425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31329,5 +31433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31337,5 +31441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31345,5 +31449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31353,5 +31457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31361,5 +31465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -31378,5 +31482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31386,5 +31490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31394,5 +31498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31402,5 +31506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31410,5 +31514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31418,5 +31522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31426,5 +31530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31434,5 +31538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31442,5 +31546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31450,5 +31554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31458,5 +31562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31466,5 +31570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31483,5 +31587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31490,5 +31594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31498,5 +31602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31505,5 +31609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31513,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31521,5 +31625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31529,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31536,5 +31640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31544,5 +31648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31552,5 +31656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31560,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31568,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31575,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31582,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31589,5 +31693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31596,5 +31700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31603,5 +31707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31610,5 +31714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31617,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31624,5 +31728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31631,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31638,5 +31742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31645,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31652,5 +31756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31659,5 +31763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31667,5 +31771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31675,5 +31779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31683,5 +31787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31691,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31699,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31707,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31715,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31723,5 +31827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31731,5 +31835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31740,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31748,5 +31852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31756,5 +31860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31764,5 +31868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31772,5 +31876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31780,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31788,5 +31892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31796,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31804,5 +31908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31812,5 +31916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31820,5 +31924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31828,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31836,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31844,5 +31948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31852,5 +31956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31860,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31868,5 +31972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31876,5 +31980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31884,5 +31988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31892,5 +31996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31899,5 +32003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -31929,5 +32033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31937,5 +32041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31945,7 +32049,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -31960,5 +32064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31968,5 +32072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31976,5 +32080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31984,5 +32088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31992,5 +32096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32000,5 +32104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32008,5 +32112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -32022,7 +32126,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32032,5 +32136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32040,5 +32144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32048,5 +32152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32056,5 +32160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32064,5 +32168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32072,5 +32176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32080,5 +32184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32088,5 +32192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32096,5 +32200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32104,5 +32208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32112,5 +32216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32120,5 +32224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32128,5 +32232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32136,5 +32240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32144,5 +32248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32152,5 +32256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32160,5 +32264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32168,5 +32272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32176,5 +32280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32184,5 +32288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32192,5 +32296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32200,5 +32304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32208,5 +32312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32216,5 +32320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32224,5 +32328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32232,5 +32336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32240,5 +32344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32248,5 +32352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32256,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32264,5 +32368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32272,5 +32376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32280,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32288,5 +32392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32296,5 +32400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32304,5 +32408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32312,5 +32416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32320,5 +32424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32328,5 +32432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32336,5 +32440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32344,5 +32448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32352,5 +32456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32360,5 +32464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -32394,7 +32498,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32404,5 +32508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32412,5 +32516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32420,5 +32524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32428,5 +32532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32436,5 +32540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32444,5 +32548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32452,5 +32556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32467,5 +32571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32475,5 +32579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32483,5 +32587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32491,5 +32595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32499,5 +32603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32507,5 +32611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32516,5 +32620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32524,5 +32628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32532,5 +32636,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32540,5 +32644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32547,5 +32651,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32554,5 +32658,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32570,7 +32674,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32580,5 +32684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32588,5 +32692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32596,5 +32700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32604,5 +32708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32612,5 +32716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32620,5 +32724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32628,5 +32732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32636,5 +32740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32644,5 +32748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32660,5 +32764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32672,5 +32776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32684,5 +32788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32692,5 +32796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32704,5 +32808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32716,6 +32820,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32725,5 +32829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32737,5 +32841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32749,5 +32853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32761,5 +32865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32773,5 +32877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32785,5 +32889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32793,7 +32897,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32803,5 +32907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32811,5 +32915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32819,5 +32923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32827,5 +32931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32842,5 +32946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32853,5 +32957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32865,5 +32969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32877,5 +32981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32889,5 +32993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32898,5 +33002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32906,5 +33010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32914,5 +33018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32922,5 +33026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32930,5 +33034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -32945,5 +33049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -32957,5 +33061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -32969,5 +33073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -32981,5 +33085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -32993,5 +33097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -33006,5 +33110,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?
@@ -33030,5 +33134,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33039,11 +33143,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33053,5 +33157,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33061,5 +33165,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33069,5 +33173,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33077,5 +33181,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33085,5 +33189,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33093,5 +33197,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33101,5 +33205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33109,5 +33213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33117,5 +33221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33125,5 +33229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33133,5 +33237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33141,5 +33245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -33159,5 +33263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -33252,5 +33356,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -33258,28 +33362,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
@@ -33394,5 +33498,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33405,5 +33509,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>
@@ -33428,6 +33532,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33436,6 +33540,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33450,6 +33554,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
@@ -33463,6 +33567,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
@@ -33482,6 +33586,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33505,6 +33609,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
@@ -33556,4 +33660,5 @@
 #~ msgstr "Neboli importované žiadne dáta."
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Chyba pri načítaní stránky {0}"
@@ -33565,4 +33670,5 @@
 #~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin nenájdený: {0}."
@@ -33584,6 +33690,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 "
@@ -33596,4 +33702,5 @@
 #~ 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"
@@ -33603,6 +33710,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"
@@ -33628,7 +33735,9 @@
 #~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Použiť prednastavenie \"{0}\""
@@ -33656,10 +33765,11 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
 #~ "Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu "
 #~ "histórie."
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Vrstvy: {0}"
@@ -33669,6 +33779,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."
@@ -33680,4 +33790,5 @@
 #~ msgstr "Nahrať výber"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -33686,7 +33797,9 @@
 #~ 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}\""
@@ -33696,6 +33809,5 @@
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
+#~ msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
 
 #~ msgid "Only one node selected"
@@ -33720,4 +33832,5 @@
 #~ 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}"
@@ -33727,6 +33840,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 "
@@ -33736,13 +33849,17 @@
 #~ 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}"
@@ -33751,4 +33868,5 @@
 #~ msgstr "Čítať GPX..."
 
+#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "súčastná odchylka: {0}s"
@@ -33763,4 +33881,5 @@
 #~ 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)."
@@ -33769,7 +33888,9 @@
 #~ 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}"
@@ -33784,6 +33905,5 @@
 #~ "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 "Update"
@@ -33814,4 +33934,5 @@
 #~ msgstr "Heslo pre proxy"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33823,4 +33944,5 @@
 #~ "{0}"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}"
@@ -33832,4 +33954,5 @@
 #~ msgstr "Značky (prázdne hodnoty zmazaných značiek)"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Príkazový Stĺpik: {0}"
@@ -33838,4 +33961,5 @@
 #~ msgstr "Obnoviť obsah výberu."
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33892,9 +34016,8 @@
 #~ msgstr "Ste si istý?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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ť?"
@@ -33910,6 +34033,5 @@
 #~ "<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"
@@ -33934,4 +34056,5 @@
 #~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu."
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Prosíme napíšte chybovú správu v {0}"
@@ -34027,4 +34150,5 @@
 #~ msgstr "Poplatok"
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
@@ -34034,12 +34158,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 ""
 #~ "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ť?"
+
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
@@ -34063,16 +34188,21 @@
 #~ msgstr "Prázdny člen vo vzťahu (relation)."
 
+#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
+#, 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."
@@ -34084,4 +34214,5 @@
 #~ msgstr "áno (pravda)"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34123,6 +34254,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34189,10 +34319,11 @@
 #~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "prekresľovač id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34209,6 +34340,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"
@@ -34217,6 +34348,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 "
@@ -34230,6 +34361,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"
@@ -34237,20 +34368,21 @@
 #~ "&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ť."
-
+#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky stiahnuť."
+
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
+#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "V súbore \"{0}\" nie je časová značka EXIF"
@@ -34271,4 +34403,5 @@
 #~ msgstr "Zobraziť panel autorov(spracovateľov)"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autori(spracovatelia): {0}"
@@ -34294,4 +34427,5 @@
 #~ "the config option 'pluginmanager.warntime'.)"
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34317,6 +34451,6 @@
 #~ msgstr "Dodatočný zdroj automatických-značiek:"
 
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#, java-format
+#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}"
@@ -34325,4 +34459,5 @@
 #~ msgstr "Odstrániť označené"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}."
@@ -34355,4 +34490,5 @@
 #~ msgstr "Posunúť dole"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relácie: {0}"
@@ -34368,11 +34504,13 @@
 #~ "nahraté elementy majú zaznamenaný priebeh(history)."
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete "
-#~ "si pokračovať?"
-
+#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete si "
+#~ "pokračovať?"
+
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Najskôr zmente projekciu na {0}."
@@ -34381,7 +34519,9 @@
 #~ 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"
@@ -34391,6 +34531,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 "
@@ -34449,14 +34589,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."
@@ -34465,10 +34605,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"
@@ -34478,4 +34618,5 @@
 #~ msgstr "<mnohonásobný>"
 
+#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -34497,6 +34638,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ť?"
@@ -34512,6 +34653,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 "
@@ -34525,6 +34666,5 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
 #~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú "
@@ -34537,4 +34677,8 @@
 #~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Chyby v priebehu sťahovania"
+
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34574,13 +34718,15 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme "
-#~ "vývojárov JOSM."
+#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme vývojárov "
+#~ "JOSM."
 
 #~ msgid "Open a layer first (GPX, OSM, cache)"
 #~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)"
 
+#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
 
+#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
@@ -34592,4 +34738,5 @@
 #~ msgstr "% lon:"
 
+#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
@@ -34598,7 +34745,9 @@
 #~ 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 "
@@ -34617,4 +34766,5 @@
 #~ 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}."
@@ -34632,4 +34782,5 @@
 #~ msgstr "Nahrávanie na OSM API neúspešné"
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
@@ -34641,25 +34792,26 @@
 #~ 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>"
-
+#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery iným "
+#~ "mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a ignorovať "
+#~ "vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id.<br>Click "
+#~ "<strong>{2}</strong> prijať stav na servery a vymazať váš pôvodný "
+#~ "stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
+#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
 #~ msgstr ""
 #~ "<html>Sú tam <strong>{0}</strong> pôvodné <br>vybrané pre individuálnu "
@@ -34678,4 +34830,5 @@
 #~ msgstr "Aktualizácia pôvodných"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34684,6 +34837,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"
@@ -34724,6 +34877,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 "
@@ -34739,6 +34892,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"
@@ -34750,6 +34903,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"
@@ -34760,8 +34913,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"
@@ -34770,8 +34923,9 @@
 #~ "máte pochybnosti, nepoužite ich."
 
+#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
-
+#~ msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
+
+#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -34784,4 +34938,5 @@
 #~ 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 "
@@ -34791,20 +34946,23 @@
 #~ "{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>"
-
+#~ "<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
 #~ 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>"
@@ -34813,4 +34971,5 @@
 #~ msgstr "WGS84 Geographisch"
 
+#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Vrstva {0} musí byť v zozname vrstiev"
@@ -34819,4 +34978,5 @@
 #~ msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam"
 
+#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Členy: {0} (spojenie: {1})"
@@ -34837,7 +34997,12 @@
 #~ 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ý!"
+
 #~ msgid "error requesting update: not zoom-level 12"
 #~ msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12"
@@ -34849,10 +35014,10 @@
 #~ msgstr "Konflikt je vytvorený"
 
+#, java-format
 #~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+#~ msgstr ""
+#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka bola: "
 #~ "{0}"
-#~ msgstr ""
-#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka "
-#~ "bola: {0}"
 
 #~ msgid "Linked"
@@ -34862,4 +35027,5 @@
 #~ 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á."
@@ -34874,16 +35040,17 @@
 #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 #~ msgstr ""
-#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main."
-#~ "getCurrentDataSet()"
-
+#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s "
+#~ "Main.getCurrentDataSet()"
+
+#, java-format
 #~ msgid "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."
@@ -34896,4 +35063,5 @@
 #~ 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?"
@@ -34908,13 +35076,15 @@
 #~ "Výnimka: {0}"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
 #~ msgstr ""
-#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. "
-#~ "Výnimka: {0}"
-
+#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. Výnimka: "
+#~ "{0}"
+
+#, java-format
 #~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
-#~ "was: {0}"
+#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: "
+#~ "{0}"
 #~ msgstr ""
 #~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. "
@@ -34924,4 +35094,5 @@
 #~ msgstr "Potvrdenie"
 
+#, java-format
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Vymazávaná vrstva {0} z {1}"
@@ -34930,10 +35101,12 @@
 #~ msgstr "Zmazať všetko"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
 #~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na "
-#~ "vrchu. Výnimka bola: {0}"
-
+#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na vrchu. "
+#~ "Výnimka bola: {0}"
+
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
@@ -34942,8 +35115,9 @@
 #~ "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á "
@@ -34951,4 +35125,5 @@
 #~ "funkciu?</html>"
 
+#, java-format
 #~ msgid ""
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
@@ -34957,23 +35132,29 @@
 #~ "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?"
@@ -34985,20 +35166,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>"
-
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</html>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
+#~ "from relation?</html>"
 #~ msgstr ""
 #~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
@@ -35011,4 +35192,5 @@
 #~ 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 "
@@ -35018,7 +35200,9 @@
 #~ "otvorený pre ďalšie nahratia"
 
+#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí"
 
+#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
@@ -35028,16 +35212,18 @@
 #~ "tomto nahratí"
 
+#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
+#~ "changeset will automatically be closed by the server after a timeout.</html>"
 #~ msgstr ""
-#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''."
-#~ "<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
+#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery "
+#~ "''{1}''.<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
 #~ "časového limitu.</html>"
 
+#, java-format
 #~ msgid "Changeset {0} is unchanged. Skipping update."
 #~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu."
@@ -35046,10 +35232,11 @@
 #~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..."
 
+#, java-format
 #~ msgid "Reusing existing changeset {0}"
 #~ msgstr "Znovu použitý existujúci súbor zmien {0}"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
+#~ "Warning: could not reuse an existing changeset as requested. Opening a new "
+#~ "one."
 #~ msgstr ""
 #~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol "
@@ -35057,13 +35244,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 ""
@@ -35075,10 +35262,11 @@
 #~ 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 "
@@ -35088,11 +35276,13 @@
 #~ 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>"
-
+#~ "<html>Vo vrstve sa nachádzajú nevyriešené konflikty ''{0}''.<br>Najskôr ich "
+#~ "vyriešte.</html>"
+
+#, java-format
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "parameter''{0}'' nesmie byť nula"
@@ -35109,22 +35299,24 @@
 #~ "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."
-
+#~ "<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
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chýba povinný atribút ''{0}''"
 
+#, java-format
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
-#~ "API version is ''0.5''. Got {1}"
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
+#~ "version is ''0.5''. Got {1}"
 #~ msgstr ""
-#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
-#~ "API verziu je ''0.5''. Got {1}"
-
+#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, API "
+#~ "verziu je ''0.5''. Got {1}"
+
+#, java-format
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, "
-#~ "API version is ''0.5''. Got {1}"
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
+#~ "version is ''0.5''. Got {1}"
 #~ msgstr ""
 #~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
@@ -35132,6 +35324,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 "
@@ -35141,4 +35333,8 @@
 #~ msgstr "<html>"
 
+#~ msgid "Apply also for children"
+#~ msgstr "Uplatniť tiež pre deti(children)"
+
+#, java-format
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
@@ -35147,26 +35343,32 @@
 #~ 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"
@@ -35178,31 +35380,38 @@
 
 #~ 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}''"
@@ -35214,4 +35423,5 @@
 #~ 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}"
@@ -35223,20 +35433,26 @@
 #~ 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}"
@@ -35245,13 +35461,17 @@
 #~ 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}''."
@@ -35259,33 +35479,37 @@
 #~ "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."
-
+#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného "
+#~ "ovládať.Ignorujem rozdielne nahrávanie."
+
+#, java-format
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
+#~ "default geometry. Details: {1}"
 #~ msgstr ""
 #~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
@@ -35293,19 +35517,22 @@
 
 #~ 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á."
-
+#~ "Nemôžem obnoviť(undo) príkaz ''{0}'' pretože vrstva ''{1}'' už viac nie je "
+#~ "prítomná."
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' nesmie byť nulový"
 
+#, java-format
 #~ msgid ""
 #~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
@@ -35337,4 +35564,5 @@
 #~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
 
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Nahrávam {0} objekty(ov) ..."
@@ -35343,17 +35571,21 @@
 #~ 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"
-
+#~ "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
 #~ 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}"
@@ -35366,4 +35598,5 @@
 #~ "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."
@@ -35380,17 +35613,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"
@@ -35398,28 +35631,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."
@@ -35429,22 +35662,29 @@
 #~ 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}"
@@ -35456,9 +35696,15 @@
 #~ 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}"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
 
 #~ msgid "GPS point"
@@ -35468,4 +35714,4 @@
 #~ "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."
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:06+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 12:52+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-02 08:34+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-07 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -257,6 +257,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -311,6 +311,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 ""
 
@@ -334,9 +334,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
@@ -427,6 +427,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -636,12 +636,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1426,5 +1426,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1445,5 +1446,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1591,5 +1592,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak"
@@ -1612,5 +1614,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1818,5 +1820,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali"
 
@@ -1882,9 +1885,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)"
@@ -1901,5 +1904,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2189,7 +2192,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Napake pri sprejemu"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2223,6 +2226,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
 msgstr ""
 
@@ -2355,6 +2358,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 ""
 
@@ -2474,68 +2477,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Išči..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Prosim, vnesite iskalni izraz."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "nadomesti izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "dodaj v izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "odstrani iz izbora"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "upoštevaj velikost črk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "regularni izraz"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
-msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2543,38 +2546,38 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+msgid "<u>Special targets:</u>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
-msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
-msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
-msgid "<b>foot:</b> - key=foot set to any value."
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
-msgid "<u>Special targets:</u>"
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
-msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2582,5 +2585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2588,11 +2591,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2600,5 +2603,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2606,39 +2613,39 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+msgid "<b>modified</b> - all changed objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgid "<b>selected</b> - all selected objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
-msgid "<b>modified</b> - all changed objects"
+msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
-msgid "<b>selected</b> - all selected objects"
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
-msgid "<b>incomplete</b> - all incomplete objects"
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
-msgid "<b>untagged</b> - all untagged objects"
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2646,11 +2653,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2658,38 +2665,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Začni iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2697,5 +2704,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2703,5 +2710,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2709,5 +2716,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2722,50 +2729,53 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2829,5 +2839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3035,7 +3045,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 ""
 
@@ -3296,6 +3306,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 ""
 
@@ -3378,5 +3388,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3385,5 +3395,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3392,5 +3402,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3427,5 +3437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3478,5 +3488,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3484,5 +3494,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3490,17 +3500,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "besedilo"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3508,5 +3512,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3515,5 +3519,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3521,5 +3525,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3527,5 +3531,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3533,42 +3537,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3577,5 +3581,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3583,5 +3587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3643,5 +3647,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3651,81 +3656,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Napaka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3899,5 +3904,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3970,5 +3976,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3978,5 +3984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3985,5 +3991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3992,5 +3998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3999,5 +4005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4006,5 +4012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4013,9 +4019,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4328,6 +4334,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4342,4 +4348,5 @@
 msgstr "Uredi"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4532,5 +4539,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4569,6 +4576,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 ""
 
@@ -4599,5 +4606,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"
@@ -4606,5 +4613,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"
@@ -4613,5 +4620,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,5 +4832,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4848,6 +4856,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4859,5 +4868,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Dol"
@@ -4902,6 +4911,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 ""
 
@@ -4909,6 +4918,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 ""
 
@@ -4959,6 +4968,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 ""
 
@@ -5175,6 +5184,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5187,6 +5196,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5484,7 +5493,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 ""
 
@@ -5509,5 +5518,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5525,6 +5535,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5548,5 +5557,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5554,5 +5563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5625,9 +5634,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5645,13 +5655,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5660,45 +5670,41 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5925,10 +5931,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6269,4 +6275,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7380,6 +7387,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 ""
 
@@ -7403,8 +7410,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 ""
 
@@ -7524,5 +7531,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7531,23 +7538,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7558,5 +7565,5 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7567,77 +7574,81 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7752,6 +7763,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 ""
 
@@ -7769,6 +7780,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 ""
 
@@ -7923,6 +7934,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8256,6 +8268,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8315,4 +8328,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8395,6 +8409,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 ""
 
@@ -8404,6 +8418,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 ""
 
@@ -8677,8 +8691,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8693,7 +8708,8 @@
 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 ""
 
@@ -8929,5 +8945,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8944,5 +8960,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9027,6 +9044,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] ""
@@ -9040,6 +9057,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 "
@@ -9265,5 +9282,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9289,5 +9306,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9342,6 +9360,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 ""
 
@@ -9395,7 +9413,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 ""
 
@@ -9405,5 +9423,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9428,5 +9446,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9644,7 +9663,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 ""
 
@@ -9670,7 +9689,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 ""
 
@@ -9734,6 +9753,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 
@@ -9747,5 +9766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9911,6 +9930,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 ""
 
@@ -9976,7 +9995,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 ""
 
@@ -10041,64 +10060,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10108,20 +10131,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10130,5 +10153,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10136,21 +10159,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10158,17 +10181,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10177,5 +10200,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10226,14 +10249,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10242,5 +10265,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10249,10 +10272,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10261,5 +10284,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10543,6 +10566,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 ""
 
@@ -10564,8 +10587,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 ""
 
@@ -10685,6 +10708,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 ""
 
@@ -10794,5 +10817,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10926,8 +10950,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 ""
 
@@ -11010,8 +11034,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 ""
 
@@ -11038,7 +11062,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 ""
 
@@ -11109,34 +11133,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr ""
-
 #. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
-msgid "Explicit waypoints with valid timestamps."
+msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
+msgid "Named trackpoints."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
-msgid "Named trackpoints."
+msgid "Modified times (time stamps) of audio files."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11144,5 +11164,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11150,21 +11170,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11172,5 +11186,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11178,5 +11192,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11184,17 +11198,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11202,13 +11216,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11248,5 +11262,5 @@
 msgstr "Barve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11257,34 +11271,34 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Force lines if no segments imported."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Riši velike točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hitrost (rdeče = počasi, zeleno = hitro)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
@@ -11292,5 +11306,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11312,5 +11326,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11352,5 +11366,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11364,50 +11378,60 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Riši smerne puščice"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Le zanimive smerne puščice (npr enosmerne ceste)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Le na koncu poti."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+msgid "Draw segment order numbers"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Riši meje sprejetega področja"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Riši nedejavne plasti v drugi barvi"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11415,9 +11439,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11426,25 +11450,26 @@
 "Nastavite ''-1'' za povezavo vseh točk."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Največja dolžina (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11452,13 +11477,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Najmanjša razdalja (slikovnih točk)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11466,9 +11491,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Barvaj točke in segmente sledi glede na hitrost."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11476,46 +11501,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Riši nedejavne podatkovne plasti v drugi barvi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Podatki OSM"
@@ -11587,5 +11613,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11634,6 +11661,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11710,6 +11737,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 ""
 
@@ -11722,9 +11749,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 ""
 
@@ -12021,6 +12048,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 ""
 
@@ -12142,6 +12169,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 ""
 
@@ -12163,6 +12190,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 ""
 
@@ -12240,5 +12267,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12254,5 +12282,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12346,6 +12375,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 ""
 
@@ -12643,5 +12672,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
@@ -12826,5 +12855,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13209,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 ""
 
@@ -13236,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 ""
 
@@ -13277,5 +13307,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13707,14 +13738,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13723,23 +13759,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13747,5 +13778,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13753,17 +13784,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13771,5 +13802,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13781,42 +13812,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Onemogoči vstavek"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13825,5 +13856,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13832,22 +13863,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Glede na podatke znotraj vstavka je avtor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -13855,9 +13886,9 @@
 "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Naj vstavek onemogočim?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13867,14 +13898,14 @@
 "njegovo odstranitev iz spomina."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "opis ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13915,5 +13946,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13975,5 +14007,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"
@@ -14056,6 +14088,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 ""
 
@@ -14063,7 +14095,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 ""
 
@@ -14071,7 +14103,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 ""
 
@@ -14079,8 +14111,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 ""
 
@@ -14100,7 +14132,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 ""
 
@@ -14169,6 +14201,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14180,7 +14213,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 ""
 
@@ -14212,9 +14245,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14870,7 +14903,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14880,5 +14913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14888,5 +14921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14902,5 +14935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14910,5 +14943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -14939,5 +14972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -14946,5 +14979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -14953,5 +14986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -14960,5 +14993,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -14967,5 +15000,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -14974,5 +15007,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15006,10 +15039,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15483,34 +15517,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr ""
@@ -15583,5 +15618,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15672,4 +15707,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15879,5 +15915,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -15998,5 +16034,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
@@ -16015,6 +16052,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 
@@ -16322,5 +16360,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -16430,5 +16469,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16479,5 +16519,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17293,4 +17334,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17735,6 +17784,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 ""
 
@@ -17820,8 +17869,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 ""
 
@@ -17875,8 +17924,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 ""
 
@@ -17988,6 +18037,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 ""
 
@@ -17995,6 +18044,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 ""
 
@@ -18629,6 +18678,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 
@@ -18775,5 +18825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18873,5 +18923,5 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19246,9 +19296,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19257,10 +19304,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr ""
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19268,25 +19315,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
-msgid "could not get audio input stream from input URL"
-msgstr ""
-
-#. Java message loading audio data
-#: build/specialmessages.java:10
-msgid "Audio Device Unavailable"
-msgstr ""
-
 #. Java message loading audio data
 #: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19294,17 +19341,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr ""
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19312,7 +19359,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19322,5 +19369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19363,5 +19410,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19371,5 +19418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19379,5 +19426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19387,8 +19434,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19402,5 +19449,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19411,5 +19458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19418,7 +19465,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19428,5 +19475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19436,5 +19483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19444,5 +19491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19452,5 +19499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19460,5 +19507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19468,5 +19515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19476,8 +19523,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19487,54 +19534,60 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
 msgid "Attributes"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
 msgid "Modified"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Resnično ime"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
 msgid "Size"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Domača stran"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "List"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Povečaj"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nova vloga"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Ustvari novo vozlišče."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Shrani"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19605,5 +19658,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19769,6 +19823,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19777,5 +19838,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19784,10 +19845,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19796,5 +19857,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19804,5 +19865,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19811,15 +19872,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19828,5 +19889,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20716,7 +20777,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20856,8 +20917,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"/>
@@ -21067,5 +21128,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21075,5 +21136,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21092,5 +21153,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21100,5 +21161,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21117,5 +21178,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21125,5 +21186,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21142,5 +21203,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21150,5 +21211,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21163,5 +21224,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21179,5 +21240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21195,5 +21256,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21202,5 +21263,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21210,5 +21271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21228,5 +21289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21235,5 +21296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21243,5 +21304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21945,5 +22006,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -21994,5 +22055,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22089,5 +22150,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22255,5 +22316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22587,5 +22648,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22595,5 +22656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22603,5 +22664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22611,5 +22672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22619,5 +22680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22627,5 +22688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22635,5 +22696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22644,5 +22705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24062,5 +24123,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24070,5 +24131,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24078,5 +24139,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24086,5 +24147,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24448,7 +24509,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24458,5 +24519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24466,5 +24527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24474,5 +24535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24482,5 +24543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24490,5 +24551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24498,5 +24559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24506,5 +24567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24514,5 +24575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24522,5 +24583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24530,5 +24591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24538,5 +24599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24546,5 +24607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24554,5 +24615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24562,5 +24623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24570,5 +24631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24578,5 +24639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24586,5 +24647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24594,5 +24655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24602,5 +24663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24610,5 +24671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24618,5 +24679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24626,5 +24687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24634,5 +24695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24642,5 +24703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24650,5 +24711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24658,5 +24719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24666,5 +24727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24674,5 +24735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24682,5 +24743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24690,5 +24751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24698,5 +24759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24706,5 +24767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24714,5 +24775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24722,5 +24783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24730,5 +24791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24738,5 +24799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24746,5 +24807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24754,5 +24815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24762,5 +24823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24770,5 +24831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24778,5 +24839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24786,5 +24847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24794,5 +24855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24802,5 +24863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24810,5 +24871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24818,5 +24879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26522,7 +26583,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26532,5 +26593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26540,5 +26601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26548,5 +26609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26556,5 +26617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26564,5 +26625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26572,5 +26633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26580,5 +26641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26588,5 +26649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28009,5 +28070,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28023,5 +28084,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28031,5 +28092,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28040,5 +28101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28051,7 +28112,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28061,5 +28122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28069,5 +28130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28077,5 +28138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28085,5 +28146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28117,5 +28178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28131,5 +28192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28139,5 +28200,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28146,5 +28207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28154,5 +28215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28163,5 +28224,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28186,5 +28247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28299,9 +28360,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
@@ -28309,5 +28370,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,
@@ -28317,8 +28378,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
@@ -28332,5 +28393,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28338,5 +28399,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28385,6 +28446,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>
@@ -28464,5 +28525,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28472,11 +28533,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28492,5 +28553,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28499,5 +28560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28506,5 +28567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28520,5 +28581,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28532,5 +28593,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28539,5 +28600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28546,5 +28607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28553,5 +28614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28560,5 +28621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28567,5 +28628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28574,5 +28635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28581,5 +28642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28588,5 +28649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28595,5 +28656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28602,5 +28663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28609,5 +28670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28616,5 +28677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28623,5 +28684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28630,5 +28691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28805,7 +28866,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28819,5 +28880,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28827,7 +28888,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28837,5 +28898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28845,5 +28906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28853,5 +28914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28861,5 +28922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28875,5 +28936,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28882,5 +28943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28890,5 +28951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -28897,5 +28958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -28904,5 +28965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -28911,5 +28972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -28918,5 +28979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -28925,5 +28986,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -28932,5 +28993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -28939,5 +29000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -28946,5 +29007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -28953,5 +29014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -28965,5 +29026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -28977,5 +29038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -28984,5 +29045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -28996,5 +29057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29009,5 +29070,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29022,5 +29083,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29034,5 +29095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29046,5 +29107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29053,5 +29114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29060,5 +29121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29068,5 +29129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29075,5 +29136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29082,5 +29143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29089,5 +29150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29097,5 +29158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29106,5 +29167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29114,7 +29175,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29124,5 +29185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29132,5 +29193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29140,5 +29201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29149,5 +29210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29156,5 +29217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29164,5 +29225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29172,5 +29233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29180,5 +29241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29188,5 +29249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29196,5 +29257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29204,5 +29265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29212,5 +29273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29220,5 +29281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29228,5 +29289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29249,5 +29310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29262,7 +29323,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29272,5 +29333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29279,5 +29340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29287,5 +29348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29294,5 +29355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29302,5 +29363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29310,5 +29371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29324,5 +29385,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29333,5 +29394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29350,5 +29411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29358,5 +29419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29369,5 +29430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29386,5 +29447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29393,5 +29454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29400,5 +29461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29407,7 +29468,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29418,5 +29479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29431,5 +29492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29443,5 +29504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29451,5 +29512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29463,5 +29524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29475,5 +29536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29482,5 +29543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29489,7 +29550,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29499,5 +29560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29507,5 +29568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29515,5 +29576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29523,5 +29584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29531,5 +29592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29545,7 +29606,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29560,5 +29621,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29573,5 +29634,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29586,5 +29647,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29599,5 +29660,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29612,5 +29673,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29625,7 +29686,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29635,5 +29696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29642,5 +29703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29650,5 +29711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29658,5 +29719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29666,5 +29727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29674,5 +29735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29682,5 +29743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29690,5 +29751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29698,5 +29759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29706,5 +29767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29714,5 +29775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29722,5 +29783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29730,5 +29791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29748,5 +29809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29761,5 +29822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29772,7 +29833,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29782,5 +29843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29790,5 +29851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29798,5 +29859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29806,5 +29867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29814,5 +29875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29822,5 +29883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29830,5 +29891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29838,5 +29899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29846,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29854,5 +29915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29862,5 +29923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29870,5 +29931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29878,5 +29939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29886,5 +29947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -29894,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -29902,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -29922,5 +29983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -29934,7 +29995,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -29944,5 +30005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -29952,5 +30013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -29960,5 +30021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -29968,5 +30029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -29976,5 +30037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -29984,5 +30045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -29992,5 +30053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30000,5 +30061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30008,5 +30069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30016,5 +30077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30033,5 +30094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30041,5 +30102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30049,5 +30110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30057,5 +30118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30065,5 +30126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30073,5 +30134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30081,5 +30142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30089,5 +30150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30097,5 +30158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30105,5 +30166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30113,5 +30174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30121,5 +30182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30138,5 +30199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30145,5 +30206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30153,5 +30214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30160,5 +30221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30168,5 +30229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30176,5 +30237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30184,5 +30245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30191,5 +30252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30199,5 +30260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30207,5 +30268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30215,5 +30276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30223,5 +30284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30230,5 +30291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30237,5 +30298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30244,5 +30305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30251,5 +30312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30258,5 +30319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30265,5 +30326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30272,5 +30333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30279,5 +30340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30286,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30293,5 +30354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30300,5 +30361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30307,5 +30368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30314,5 +30375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30322,5 +30383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30330,5 +30391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30338,5 +30399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30346,5 +30407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30354,5 +30415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30362,5 +30423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30370,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30378,5 +30439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30386,5 +30447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30395,5 +30456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30403,5 +30464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30411,5 +30472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30419,5 +30480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30427,5 +30488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30435,5 +30496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30443,5 +30504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30451,5 +30512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30459,5 +30520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30467,5 +30528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30475,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30483,5 +30544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30491,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30499,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30507,5 +30568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30515,5 +30576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30523,5 +30584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30531,5 +30592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30539,5 +30600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30547,5 +30608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30554,5 +30615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30584,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30592,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30600,7 +30661,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30615,5 +30676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30623,5 +30684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30631,5 +30692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30639,5 +30700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30647,5 +30708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30655,5 +30716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30663,5 +30724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30677,7 +30738,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30687,5 +30748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30695,5 +30756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30703,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30711,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30719,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30727,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30735,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30743,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30751,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30759,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30767,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30775,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30783,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30791,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30799,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30807,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30815,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30823,5 +30884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30831,5 +30892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30839,5 +30900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30847,5 +30908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30855,5 +30916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30863,5 +30924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30871,5 +30932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30879,5 +30940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30887,5 +30948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -30895,5 +30956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -30903,5 +30964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -30911,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -30919,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -30927,5 +30988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -30935,5 +30996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -30943,5 +31004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -30951,5 +31012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -30959,5 +31020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -30967,5 +31028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -30975,5 +31036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -30983,5 +31044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -30991,5 +31052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -30999,5 +31060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31007,5 +31068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31015,5 +31076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31049,7 +31110,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31059,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31067,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31075,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31083,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31091,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31099,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31107,5 +31168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31122,5 +31183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31130,5 +31191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31138,5 +31199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31146,5 +31207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31154,5 +31215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31162,5 +31223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31171,5 +31232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31179,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31187,5 +31248,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31195,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31202,5 +31263,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31209,5 +31270,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31225,7 +31286,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31235,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31243,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31251,5 +31312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31259,5 +31320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31267,5 +31328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31275,5 +31336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31283,5 +31344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31291,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31299,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31315,5 +31376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31327,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31339,5 +31400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31347,5 +31408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31359,5 +31420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31371,6 +31432,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31380,5 +31441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31392,5 +31453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31404,5 +31465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31416,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31428,5 +31489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31440,5 +31501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31448,7 +31509,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31458,5 +31519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31466,5 +31527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31474,5 +31535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31482,5 +31543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31497,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31508,5 +31569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31520,5 +31581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31532,5 +31593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31544,5 +31605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31553,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31561,5 +31622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31569,5 +31630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31577,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31585,5 +31646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31600,5 +31661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31612,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31624,5 +31685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31636,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31648,5 +31709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31661,5 +31722,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?
@@ -31685,5 +31746,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31694,11 +31755,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31708,5 +31769,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31716,5 +31777,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31724,5 +31785,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31732,5 +31793,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31740,5 +31801,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31748,5 +31809,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31756,5 +31817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31764,5 +31825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31772,5 +31833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31780,5 +31841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31788,5 +31849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31796,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31814,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -31907,5 +31968,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -31913,28 +31974,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
@@ -32049,5 +32110,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32060,5 +32121,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>
@@ -32083,6 +32144,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32091,6 +32152,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32105,6 +32166,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
@@ -32118,6 +32179,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
@@ -32137,6 +32198,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32160,6 +32221,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
@@ -32184,7 +32245,9 @@
 #~ 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"
@@ -32193,10 +32256,13 @@
 #~ 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}"
@@ -32211,4 +32277,5 @@
 #~ msgstr "moja različica:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32241,4 +32308,5 @@
 #~ msgstr "E-pošta"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontaktiraj {0}..."
@@ -32250,10 +32318,13 @@
 #~ 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}"
@@ -32266,4 +32337,5 @@
 #~ msgstr[3] "slike"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} znotraj sledi."
@@ -32295,4 +32367,5 @@
 #~ msgstr "Sprejmi področje"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32304,7 +32377,9 @@
 #~ " {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č"
@@ -32380,16 +32455,17 @@
 #~ 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"
@@ -32406,6 +32482,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 ""
@@ -32417,15 +32493,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"
@@ -32441,7 +32517,9 @@
 #~ 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}"
@@ -32474,4 +32552,5 @@
 #~ msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
@@ -32498,4 +32577,5 @@
 #~ msgstr "Vse poti so bile prazne"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Napaka pri nalaganju strani {0}"
@@ -32519,4 +32599,7 @@
 #~ msgstr "Posodobi izbor"
 
+#~ msgid "Errors during Download"
+#~ msgstr "Napake pri sprejemu"
+
 #~ msgid "ways"
 #~ msgstr "poti"
@@ -32537,4 +32620,5 @@
 #~ 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 21602)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 21603)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-05-10 10:27+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-06 18:29+0000\n"
+"Last-Translator: jordgubbe <Unknown>\n"
 "Language-Team: Swedish <sv@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-02 08:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 07:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -262,6 +262,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -293,5 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Klicka för att avbryta starten av externa webläsare"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -316,9 +316,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
@@ -341,9 +341,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
@@ -434,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -649,12 +649,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -775,5 +775,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "Ogiltigt ID angivet. Nedladdning kan ej ske"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -1018,5 +1018,6 @@
 #: ../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
@@ -1174,5 +1175,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
 msgid "Move Node..."
-msgstr ""
+msgstr "Flytta nod"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
@@ -1183,5 +1184,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 msgid "New Layer"
-msgstr ""
+msgstr "Nytt lager"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
@@ -1336,5 +1337,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
 msgid "Selection must consist only of ways and nodes."
-msgstr ""
+msgstr "Markeringen kan bara bestå av Ways och noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188
@@ -1458,5 +1459,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1477,5 +1479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1627,5 +1629,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Visa statusrapport med information som kan vara av nytta vid felrapportering."
@@ -1648,5 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1663,5 +1666,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
 msgid "Yes, delete nodes"
-msgstr ""
+msgstr "Ja, radera noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
@@ -1789,6 +1792,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
@@ -1797,6 +1800,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
@@ -1857,5 +1860,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
@@ -1931,9 +1935,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)"
@@ -1950,5 +1954,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2167,5 +2171,6 @@
 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
@@ -2240,7 +2245,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Fel under nedladdning"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Fel under hämtning"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2274,7 +2279,7 @@
 msgstr "({0}/{1}) Laddar relationen {2}:s överordnade"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Fel under hämtning"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2408,6 +2413,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 "
@@ -2536,52 +2541,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Sök..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Sök efter objekt."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Ange filtersträng"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Ange en söksträng."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Ange sökuttryck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "ersätt urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "utöka urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "ta bort från urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "sök i markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "gör skillnad på gemener/VERSALER"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "reguljärt uttryck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
@@ -2589,5 +2594,5 @@
 "värde som helst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
@@ -2595,13 +2600,13 @@
 "värde som helst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' var som helst i nyckeln name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - nyckel \"type\" med det exakta värdet \"route\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2611,21 +2616,21 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - som inte har ''Bak''  i nyckeln name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 eller on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - som innehåller nyckeln foot oavsett dess värde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Särskilda mål:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2634,17 +2639,17 @@
 "<b>relation</b> för relation)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - alla objekt som ändrats av användare..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - alla objekt ändrade av anonyma användare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt med angivet ID (0 för alla nya objekt)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2654,5 +2659,5 @@
 "angiven version)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2662,13 +2667,13 @@
 "angivet ändringsset)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<b>nodes:</b>... - objekt med angivet antal noder (nodes:antal eller nodes:"
-"min-max)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+"<b>nodes:</b>... - objekt med angivet antal noder (nodes:antal eller "
+"nodes:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2678,5 +2683,9 @@
 "max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2686,21 +2695,21 @@
 "12T14:51:09Z</b>, <b>2006-11-12</b> eller <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alla ändrade objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alla valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alla ofullständiga objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>otaggade</b> - alla otaggede objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2708,5 +2717,5 @@
 "<b>child <i>uttryck</i></b> - alla barn till objekt matchande uttrycket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2714,27 +2723,27 @@
 "<b>parent <i>uttryck</i></b> - alla föräldrar till objekt matchande uttrycket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
 "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>)."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+"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:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2742,38 +2751,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Sök"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Påbörja sökning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Inga sökträffar för ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Urvalet begränsades inte genom att söka efter ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Inget funnet i markeringen vid sökande efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2781,5 +2790,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2787,5 +2796,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2793,8 +2802,8 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
-msgstr ""
+msgstr "RX"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
@@ -2810,50 +2819,54 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Mönstersyntaxfel: Mönster {0} i {1} är inte giltigt!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr "Okänd primitivtyp: {0}. Tillåtna värden är nod, sträcka eller relation"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+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
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+msgstr "Parameter saknar för NOT"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2921,5 +2934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3129,7 +3142,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> "
@@ -3395,6 +3408,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 ""
 
@@ -3477,5 +3490,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3484,5 +3497,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3491,5 +3504,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3526,5 +3539,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3577,5 +3590,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3583,5 +3596,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3589,17 +3602,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "text"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3607,5 +3614,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3614,5 +3621,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3620,5 +3627,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3626,5 +3633,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3632,42 +3639,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3676,5 +3683,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3682,5 +3689,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3736,5 +3743,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3744,81 +3752,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Det finns mer än en \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Det finns mer än en \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Okänd medlemstyp för ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Det finns inte någon \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil för restriktion {0} kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil för yttre väg ''{0}'' passar inte."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Fel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3992,5 +4000,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -4061,5 +4070,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4069,5 +4078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4076,5 +4085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4083,5 +4092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4090,5 +4099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4097,5 +4106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4104,9 +4113,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4249,5 +4258,6 @@
 #: ../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
@@ -4287,5 +4297,6 @@
 #: ../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
@@ -4423,6 +4434,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4437,4 +4448,5 @@
 msgstr "Redigera"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4627,5 +4639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4664,6 +4676,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 ""
 
@@ -4694,5 +4706,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"
@@ -4701,5 +4713,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"
@@ -4708,5 +4720,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"
@@ -4920,5 +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."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4943,6 +4956,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4954,5 +4968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr ""
@@ -4997,6 +5011,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 ""
 
@@ -5004,6 +5018,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 ""
 
@@ -5054,6 +5068,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 ""
 
@@ -5270,6 +5284,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5282,6 +5296,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5579,7 +5593,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 ""
 
@@ -5604,5 +5618,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5620,6 +5635,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5643,5 +5657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5649,5 +5663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5696,5 +5710,6 @@
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan."
+msgstr ""
+"Sätt urval av element på kartan till de valda posterna i listan ovan."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
@@ -5721,9 +5736,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5741,13 +5757,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5756,45 +5772,41 @@
 msgstr "Lägg till"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6021,10 +6033,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6367,4 +6379,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7478,6 +7491,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 ""
 
@@ -7501,8 +7514,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 ""
 
@@ -7622,5 +7635,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7629,23 +7642,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7654,5 +7667,5 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7661,77 +7674,81 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Välj de objekt vars egenskaper du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7846,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 ""
 
@@ -7863,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 ""
 
@@ -8017,6 +8034,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8329,5 +8347,6 @@
 #: ../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
@@ -8351,6 +8370,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8410,4 +8430,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8490,6 +8511,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 ""
 
@@ -8499,6 +8520,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 ""
 
@@ -8772,8 +8793,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8788,13 +8810,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Uppladdning <strong>misslyckades</strong eftersom servern har en nyare "
 "version<br>av någon av dina noder, vägar eller relationer.<br><br>Klicka på "
-"<strong>{0}</strong> för att synkronisera all lokal data med servern."
-"<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta redigera."
-"<br></html>"
+"<strong>{0}</strong> för att synkronisera all lokal data med "
+"servern.<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta "
+"redigera.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9029,5 +9052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9044,5 +9067,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9127,6 +9151,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] ""
@@ -9140,6 +9164,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 "
@@ -9365,5 +9389,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9389,5 +9413,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9442,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 ""
 
@@ -9495,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 ""
 
@@ -9505,5 +9530,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9528,5 +9553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9744,7 +9770,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 ""
 
@@ -9770,7 +9796,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 ""
 
@@ -9834,6 +9860,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
@@ -9849,5 +9875,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10017,6 +10043,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 ""
 
@@ -10076,7 +10102,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 "
@@ -10146,64 +10172,68 @@
 msgstr "Auto-gissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Tidszon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Förskjutning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Sätt bilder i relation till GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Korrelera"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ogiltig förskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10213,20 +10243,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10235,5 +10265,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10241,21 +10271,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "De markerade fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10264,17 +10294,17 @@
 "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX-spåret saknar tidsinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Välj ett GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Inget GPX-spår har valts"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10285,5 +10315,5 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10336,14 +10366,14 @@
 msgstr "Fel vid läsning av filer från folder {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10352,5 +10382,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10359,10 +10389,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10371,5 +10401,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10661,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 ""
 
@@ -10682,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 ""
 
@@ -10803,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 ""
 
@@ -10912,5 +10942,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11044,8 +11075,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 ""
 
@@ -11128,8 +11159,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 ""
 
@@ -11156,7 +11187,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 ""
 
@@ -11228,34 +11259,31 @@
 msgstr "Visa live-ljudspår."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Skapa icke-ljudsmarkörer vid läsning av GPX."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Explicita sträckpunkter med giltiga tidsstämplar."
 
+#: ../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."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
-msgid "Explicit waypoints with time estimated from track position."
-msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
 msgstr "Namngivna spårpunkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Ändrade tidpunkter (tidsstämplar) från ljudfiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Början av spåret (görs alltid om det inte finns andra markörer)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Visa eller dölj ljudmenyn på huvudmenyn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11265,5 +11293,5 @@
 "där det ljud som spelas upp samtidigt spelades in."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11273,24 +11301,16 @@
 "knappikoner."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Skapa vid öppning av ett GPX-lager automatiskt ett markörlager från "
-"tillgängliga sträckpunkter."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Vid import av ljud, skapa markörer från..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 "Vid ljudimport, tillämpa ljud på tillgängliga sträckpunkter i GPX-lagret."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11300,5 +11320,5 @@
 "sträckpunkter) med namn och beskrivningar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11306,5 +11326,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11313,17 +11333,17 @@
 "Antal sekunder att hoppa framåt eller bakåt när knapparna i fråga trycks ner"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Tid framåt/bakåt (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Hur många gånger hastigheten fördubblas vid snabbspolning framåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Multiplikator för snabbspolning framåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11333,14 +11353,14 @@
 "värde) begärd position på ljudspåret"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Inledningstid (sekunder)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 "Förhållandet mellan tid förfluten i ljudinspelaren och verklig förfluten tid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Kalibrering av röstinspelare"
@@ -11380,5 +11400,5 @@
 msgstr "Färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11389,34 +11409,34 @@
 msgstr "Alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Inget"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Tvinga linjer om inga segment importerats."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Rita stora GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet (röd = långsam, grön = snabb)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -11424,5 +11444,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11444,5 +11464,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11484,5 +11504,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11496,16 +11516,16 @@
 msgstr "Fotgängare"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Rita riktningspilar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Snabb ritning (ser sämre ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11514,34 +11534,46 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Enbart på en sträckas huvud."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Rita ut segmentens ordningsnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Rita gränser för hämtade data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Rita virtuella noder i urvalsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Rita inaktiva lager i avvikande färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Mjuk kartgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Skapa vid öppning av ett GPX-lager automatiskt ett markörlager från "
+"tillgängliga sträckpunkter."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Rita linjer mellan råa GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11551,9 +11583,9 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11562,10 +11594,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maxlängd (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11574,11 +11606,12 @@
 "linjeinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Rita riktningspilar med hjälp av tabelluppslagning istället för komplicerad "
@@ -11586,5 +11619,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11594,13 +11627,13 @@
 "senast ritade pil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimiavstånd (pixlar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Rita större punkter för GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11610,9 +11643,9 @@
 "hjälp av lagerhanteraren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11620,37 +11653,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+msgstr ""
+"Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Spår- och punktfärgläggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Rita riktningsanvisningar för delsträckor."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rita gränser för data hämtade från servern."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11658,9 +11693,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Rita de inaktiva datalagren i avvikande färg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11732,5 +11767,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11779,6 +11815,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11855,6 +11891,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 ""
 
@@ -11867,9 +11903,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 ""
 
@@ -12170,6 +12206,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 ""
 
@@ -12291,6 +12327,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 ""
 
@@ -12312,6 +12348,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 ""
 
@@ -12389,5 +12425,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12403,5 +12440,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12495,6 +12533,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 ""
 
@@ -12790,5 +12828,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
@@ -12973,5 +13011,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13356,6 +13395,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 ""
 
@@ -13383,6 +13422,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 ""
 
@@ -13424,5 +13463,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13796,5 +13836,6 @@
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
+msgstr ""
+"Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
@@ -13853,14 +13894,21 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr ""
+"Kunde inte hämta insticksmodulen {0}. Skall den tas bort från "
+"inställningarna?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13869,25 +13917,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Kunde inte hämta insticksmodulen {0}. Skall den tas bort från "
-"inställningarna?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13895,5 +13936,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13901,17 +13942,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13919,5 +13960,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13929,42 +13970,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Avaktivera insticksmodul"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Behåll plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13973,5 +14014,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13980,22 +14021,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Enligt information inifrån insticksmodulen är dess upphovsman {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14004,9 +14045,9 @@
 "innan du rapporterar en bugg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Skall insticksmodulen avaktiveras?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14016,14 +14057,14 @@
 "frigöra insticksmodulen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "ingen beskrivning tillgänglig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14064,5 +14105,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14124,5 +14166,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"
@@ -14205,6 +14247,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 "
@@ -14215,7 +14257,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 ""
 
@@ -14223,7 +14265,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 ""
 
@@ -14231,8 +14273,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 ""
 
@@ -14252,7 +14294,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 ""
 
@@ -14321,6 +14363,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14332,7 +14375,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 ""
 
@@ -14364,9 +14407,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14427,6 +14470,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"
@@ -15031,7 +15074,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15041,5 +15084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15049,5 +15092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15063,5 +15106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15071,5 +15114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15100,5 +15143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15107,5 +15150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15114,5 +15157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15121,5 +15164,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15128,5 +15171,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15135,5 +15178,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15167,10 +15210,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15652,34 +15696,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Använd"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Välj schema att använda."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Färgschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Välj schema att ta bort."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Använd valt schema från listan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Använd de nuvarade färgerna som ett nytt färgschema."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Ta bort valt schema från listan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Färgscheman"
@@ -15752,5 +15797,5 @@
 msgstr "Lager för editering av GPX-spår"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertera till GPX-lager med anonymiserad tid"
@@ -15841,4 +15886,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15904,6 +15950,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
@@ -16051,5 +16097,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16170,5 +16216,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250."
@@ -16192,6 +16239,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Noggrannhet för Douglas-Peuckers linjeförenkling, mätt i grader.<br>Lägre "
@@ -16506,5 +16554,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Huvudet innehåller flera värden och kan inte mappas till en enda sträng"
@@ -16617,5 +16666,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16668,5 +16718,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -16958,5 +17009,6 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr "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
@@ -17490,4 +17542,12 @@
 msgstr "Husrad"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17932,6 +17992,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 ""
 
@@ -18017,8 +18077,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 ""
 
@@ -18072,8 +18132,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 ""
 
@@ -18185,6 +18245,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 ""
 
@@ -18192,6 +18252,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 ""
 
@@ -18825,5 +18885,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
 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:680
@@ -18837,6 +18898,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"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 "
@@ -18988,5 +19050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19094,5 +19156,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19468,9 +19530,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19481,10 +19540,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Databasen är nere för underhåll"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19492,25 +19551,25 @@
 msgstr ""
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "kunde inte hämta ljudström från adressen"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr ""
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19518,17 +19577,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "skog"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19536,7 +19595,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19546,5 +19605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19587,5 +19646,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19595,5 +19654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19603,5 +19662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19611,8 +19670,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19626,5 +19685,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19635,5 +19694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19642,7 +19701,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19652,5 +19711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19660,5 +19719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19668,5 +19727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19676,5 +19735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19684,5 +19743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19692,5 +19751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19700,8 +19759,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19711,58 +19770,60 @@
 msgstr "rutt"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Valfria attribut:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "ingen modifierare"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Namn"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Stätta"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Hemsida"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "daoism"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Zooma in"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Ny roll"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Skapa ny nod"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Spara"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19833,5 +19894,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -20001,6 +20063,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20009,5 +20078,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20016,10 +20085,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20028,5 +20097,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20036,5 +20105,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20043,15 +20112,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20060,5 +20129,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20948,7 +21017,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21088,8 +21157,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"/>
@@ -21299,5 +21368,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21307,5 +21376,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21324,5 +21393,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21332,5 +21401,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21349,5 +21418,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21357,5 +21426,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21374,5 +21443,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21382,5 +21451,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21395,5 +21464,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21411,5 +21480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21427,5 +21496,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21434,5 +21503,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21442,5 +21511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21460,5 +21529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21467,5 +21536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21475,5 +21544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22177,5 +22246,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22226,5 +22295,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22321,5 +22390,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22487,5 +22556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22819,5 +22888,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22827,5 +22896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22835,5 +22904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22843,5 +22912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22851,5 +22920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22859,5 +22928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22867,5 +22936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22876,5 +22945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24294,5 +24363,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24302,5 +24371,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24310,5 +24379,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24318,5 +24387,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24680,7 +24749,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24690,5 +24759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24698,5 +24767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24706,5 +24775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24714,5 +24783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24722,5 +24791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24730,5 +24799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24738,5 +24807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24746,5 +24815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24754,5 +24823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24762,5 +24831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24770,5 +24839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24778,5 +24847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24786,5 +24855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24794,5 +24863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24802,5 +24871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24810,5 +24879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24818,5 +24887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24826,5 +24895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24834,5 +24903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24842,5 +24911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24850,5 +24919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24858,5 +24927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24866,5 +24935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24874,5 +24943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24882,5 +24951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24890,5 +24959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24898,5 +24967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24906,5 +24975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24914,5 +24983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24922,5 +24991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24930,5 +24999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24938,5 +25007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24946,5 +25015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24954,5 +25023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24962,5 +25031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24970,5 +25039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24978,5 +25047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24986,5 +25055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24994,5 +25063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25002,5 +25071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25010,5 +25079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25018,5 +25087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25026,5 +25095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25034,5 +25103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25042,5 +25111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25050,5 +25119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26754,7 +26823,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26764,5 +26833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26772,5 +26841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26780,5 +26849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26788,5 +26857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26796,5 +26865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26804,5 +26873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26812,5 +26881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26820,5 +26889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28241,5 +28310,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28255,5 +28324,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28263,5 +28332,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28272,5 +28341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28283,7 +28352,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28293,5 +28362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28301,5 +28370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28309,5 +28378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28317,5 +28386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28349,5 +28418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28363,5 +28432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28371,5 +28440,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28378,5 +28447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28386,5 +28455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28395,5 +28464,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28418,5 +28487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28531,9 +28600,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
@@ -28541,5 +28610,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,
@@ -28549,8 +28618,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
@@ -28564,5 +28633,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28570,5 +28639,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28617,6 +28686,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>
@@ -28696,5 +28765,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28704,11 +28773,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28724,5 +28793,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28731,5 +28800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28738,5 +28807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28752,5 +28821,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28764,5 +28833,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28771,5 +28840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28778,5 +28847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28785,5 +28854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28792,5 +28861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28799,5 +28868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28806,5 +28875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28813,5 +28882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28820,5 +28889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28827,5 +28896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28834,5 +28903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28841,5 +28910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28848,5 +28917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28855,5 +28924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28862,5 +28931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29037,7 +29106,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29051,5 +29120,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29059,7 +29128,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29069,5 +29138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29077,5 +29146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29085,5 +29154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29093,5 +29162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29107,5 +29176,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29114,5 +29183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29122,5 +29191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29129,5 +29198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29136,5 +29205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29143,5 +29212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29150,5 +29219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29157,5 +29226,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29164,5 +29233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29171,5 +29240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29178,5 +29247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29185,5 +29254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29197,5 +29266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29209,5 +29278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29216,5 +29285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29228,5 +29297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29241,5 +29310,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29254,5 +29323,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29266,5 +29335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29278,5 +29347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29285,5 +29354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29292,5 +29361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29300,5 +29369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29307,5 +29376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29314,5 +29383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29321,5 +29390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29329,5 +29398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29338,5 +29407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29346,7 +29415,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29356,5 +29425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29364,5 +29433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29372,5 +29441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29381,5 +29450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29388,5 +29457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29396,5 +29465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29404,5 +29473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29412,5 +29481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29420,5 +29489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29428,5 +29497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29436,5 +29505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29444,5 +29513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29452,5 +29521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29460,5 +29529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29481,5 +29550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29494,7 +29563,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29504,5 +29573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29511,5 +29580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29519,5 +29588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29526,5 +29595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29534,5 +29603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29542,5 +29611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29556,5 +29625,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29565,5 +29634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29582,5 +29651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29590,5 +29659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29601,5 +29670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29618,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29625,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29632,5 +29701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29639,7 +29708,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29650,5 +29719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29663,5 +29732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29675,5 +29744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29683,5 +29752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29695,5 +29764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29707,5 +29776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29714,5 +29783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29721,7 +29790,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29731,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29739,5 +29808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29747,5 +29816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29755,5 +29824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29763,5 +29832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29777,7 +29846,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29792,5 +29861,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29805,5 +29874,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29818,5 +29887,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29831,5 +29900,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29844,5 +29913,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29857,7 +29926,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29867,5 +29936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29874,5 +29943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29882,5 +29951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29890,5 +29959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29898,5 +29967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29906,5 +29975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29914,5 +29983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29922,5 +29991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29930,5 +29999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29938,5 +30007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29946,5 +30015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29954,5 +30023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29962,5 +30031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29980,5 +30049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29993,5 +30062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30004,7 +30073,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30014,5 +30083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30022,5 +30091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30030,5 +30099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30038,5 +30107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30046,5 +30115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30054,5 +30123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30062,5 +30131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30070,5 +30139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30078,5 +30147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30086,5 +30155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30094,5 +30163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30102,5 +30171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30110,5 +30179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30118,5 +30187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30126,5 +30195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30134,5 +30203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30154,5 +30223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30166,7 +30235,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30176,5 +30245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30184,5 +30253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30192,5 +30261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30200,5 +30269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30208,5 +30277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30216,5 +30285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30224,5 +30293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30232,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30240,5 +30309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30248,5 +30317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30265,5 +30334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30273,5 +30342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30281,5 +30350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30289,5 +30358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30297,5 +30366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30305,5 +30374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30313,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30321,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30329,5 +30398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30337,5 +30406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30345,5 +30414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30353,5 +30422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30370,5 +30439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30377,5 +30446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30385,5 +30454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30392,5 +30461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30400,5 +30469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30408,5 +30477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30416,5 +30485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30423,5 +30492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30431,5 +30500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30439,5 +30508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30447,5 +30516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30455,5 +30524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30462,5 +30531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30469,5 +30538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30476,5 +30545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30483,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30490,5 +30559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30497,5 +30566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30504,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30511,5 +30580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30518,5 +30587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30525,5 +30594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30532,5 +30601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30539,5 +30608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30546,5 +30615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30554,5 +30623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30562,5 +30631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30570,5 +30639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30578,5 +30647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30586,5 +30655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30594,5 +30663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30602,5 +30671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30610,5 +30679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30618,5 +30687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30627,5 +30696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30635,5 +30704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30643,5 +30712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30651,5 +30720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30659,5 +30728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30667,5 +30736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30675,5 +30744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30683,5 +30752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30691,5 +30760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30699,5 +30768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30707,5 +30776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30715,5 +30784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30723,5 +30792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30731,5 +30800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30739,5 +30808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30747,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30755,5 +30824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30763,5 +30832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30771,5 +30840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30779,5 +30848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30786,5 +30855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30816,5 +30885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30824,5 +30893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30832,7 +30901,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30847,5 +30916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30855,5 +30924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30863,5 +30932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30871,5 +30940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30879,5 +30948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30887,5 +30956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30895,5 +30964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30909,7 +30978,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30919,5 +30988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30927,5 +30996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30935,5 +31004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30943,5 +31012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30951,5 +31020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30959,5 +31028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30967,5 +31036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30975,5 +31044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30983,5 +31052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30991,5 +31060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30999,5 +31068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31007,5 +31076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31015,5 +31084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31023,5 +31092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31031,5 +31100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31039,5 +31108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31047,5 +31116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31055,5 +31124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31063,5 +31132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31071,5 +31140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31079,5 +31148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31087,5 +31156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31095,5 +31164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31103,5 +31172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31111,5 +31180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31119,5 +31188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31127,5 +31196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31135,5 +31204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31143,5 +31212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31151,5 +31220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31159,5 +31228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31167,5 +31236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31175,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31183,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31191,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31199,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31207,5 +31276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31215,5 +31284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31223,5 +31292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31231,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31239,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31247,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31281,7 +31350,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31291,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31299,5 +31368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31307,5 +31376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31315,5 +31384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31323,5 +31392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31331,5 +31400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31339,5 +31408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31354,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31362,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31370,5 +31439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31378,5 +31447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31386,5 +31455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31394,5 +31463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31403,5 +31472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31411,5 +31480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31419,5 +31488,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31427,5 +31496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31434,5 +31503,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31441,5 +31510,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31457,7 +31526,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31467,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31475,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31483,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31491,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31499,5 +31568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31507,5 +31576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31515,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31523,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31531,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31547,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31559,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31571,5 +31640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31579,5 +31648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31591,5 +31660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31603,6 +31672,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31612,5 +31681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31624,5 +31693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31636,5 +31705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31648,5 +31717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31660,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31672,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31680,7 +31749,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31690,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31698,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31706,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31714,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31729,5 +31798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31740,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31752,5 +31821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31764,5 +31833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31776,5 +31845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31785,5 +31854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31793,5 +31862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31801,5 +31870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31809,5 +31878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31817,5 +31886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31832,5 +31901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31844,5 +31913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31856,5 +31925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31868,5 +31937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31880,5 +31949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31893,5 +31962,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?
@@ -31917,5 +31986,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31926,11 +31995,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31940,5 +32009,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31948,5 +32017,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31956,5 +32025,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31964,5 +32033,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31972,5 +32041,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31980,5 +32049,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31988,5 +32057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31996,5 +32065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32004,5 +32073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32012,5 +32081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32020,5 +32089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32028,5 +32097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32046,5 +32115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32139,5 +32208,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32145,28 +32214,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
@@ -32281,5 +32350,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32292,5 +32361,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>
@@ -32315,6 +32384,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32323,6 +32392,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32337,6 +32406,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
@@ -32350,6 +32419,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
@@ -32369,6 +32438,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32392,6 +32461,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
@@ -32448,4 +32517,5 @@
 #~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fel vid inläsning av sida{0}"
@@ -32455,9 +32525,8 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still want "
+#~ "to merge them?"
 #~ msgstr ""
-#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
-#~ "dem?"
+#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -32472,11 +32541,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"
@@ -32498,4 +32567,5 @@
 #~ msgstr "deras version:"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32518,4 +32588,5 @@
 #~ msgstr "Ingen data importerad."
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakta {0}..."
@@ -32554,4 +32625,5 @@
 #~ 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}"
@@ -32560,7 +32632,9 @@
 #~ 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}"
@@ -32569,10 +32643,13 @@
 #~ 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}"
@@ -32584,7 +32661,9 @@
 #~ 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}\"."
@@ -32605,4 +32684,5 @@
 #~ msgstr "Uppdatera"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} inom spåret."
@@ -32612,6 +32692,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32620,9 +32699,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"
@@ -32640,4 +32719,5 @@
 #~ msgstr "Fel vid tolkning."
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Insticksmodulen kunde ej hittas: {0}."
@@ -32645,7 +32725,7 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
-#~ "servern."
-
+#~ "Tips: Några av ändringarna härrör från inskickning av nya data till servern."
+
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32658,4 +32738,5 @@
 #~ " {0}"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
@@ -32780,6 +32861,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 "
@@ -32805,9 +32886,8 @@
 
 #~ 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"
@@ -32820,4 +32900,5 @@
 #~ msgstr "Förbereder..."
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
@@ -32833,7 +32914,8 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
-#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
-
+#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning visas<br> "
+#~ "med hjälp av inställningen 'pluginmanager.warntime'.)"
+
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Lämna in en rapport på {0}"
@@ -32844,6 +32926,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"
@@ -32887,4 +32969,5 @@
 #~ msgstr "Id för Metacartas korrigerade kartbild"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "korrigeringsid={0}"
@@ -32908,4 +32991,7 @@
 #~ msgstr "<nd> har nollreferens"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Skapa icke-ljudsmarkörer vid läsning av GPX."
+
 #~ msgid "The base URL for the OSM server (REST API)"
 #~ msgstr "Bas-URL för OSM-servern (REST API)"
@@ -32926,13 +33012,14 @@
 #~ 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."
@@ -32953,7 +33040,9 @@
 #~ "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}\""
@@ -32973,6 +33062,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 "
@@ -32989,6 +33078,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"
@@ -33000,6 +33089,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"
@@ -33011,14 +33100,13 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/"
-#~ "rectifier/ , så behöver du enbart ange relevant 'id'.\n"
-#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, "
-#~ "skapa manuellt en url som i följande exempel och ersätt 73 med id för din "
-#~ "bild: \n"
+#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/rectifier/ , "
+#~ "så behöver du enbart ange relevant 'id'.\n"
+#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, skapa "
+#~ "manuellt en url som i följande exempel och ersätt 73 med id för din bild: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du "
-#~ "är tveksam så använd inte den."
+#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du är "
+#~ "tveksam så använd inte den."
 
 #~ msgid "Portcullis"
@@ -33028,9 +33116,8 @@
 #~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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?"
@@ -33043,10 +33130,10 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
-#~ "försök igen efter en stund."
-
+#~ "Servern svarade med internt fel. Försök med ett mindre område eller försök "
+#~ "igen efter en stund."
+
+#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
 #~ msgstr ""
 #~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt."
@@ -33055,4 +33142,5 @@
 #~ msgstr "Skicka in till OSM..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33066,25 +33154,33 @@
 #~ "{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 "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}"
@@ -33111,10 +33207,13 @@
 #~ msgstr "Ersätter urvalet med användarens data"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Upphovsmän: {0}"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lager: {0}"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Kommandolista: {0}"
@@ -33140,11 +33239,10 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
-#~ "panorera."
-
+#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och panorera."
+
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
-#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: "
-#~ "{0}\n"
+#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -33183,9 +33281,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"
@@ -33206,6 +33304,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"
@@ -33215,4 +33313,5 @@
 #~ msgstr "Flytta nedåt"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relationsredigerare:{0}"
@@ -33228,14 +33327,15 @@
 #~ "skickats in har en historik."
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
-#~ "fortsätta?"
+#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?"
 
 #~ msgid "Update Data"
 #~ msgstr "Uppdatera data"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Ändra projektionen till {0} först."
@@ -33272,9 +33372,11 @@
 
 #~ 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"
+#~ msgstr "Fel under nedladdning"
 
 #~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
@@ -33291,7 +33393,9 @@
 #~ "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"
@@ -33306,4 +33410,5 @@
 #~ msgstr "Slå ihop sträckor med olika roller?"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33328,4 +33433,5 @@
 #~ msgstr "Ångrar radering av väg..."
 
+#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida nod {0} är borta..."
@@ -33334,30 +33440,30 @@
 #~ msgstr "Återskapar relation..."
 
+#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
 
+#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
+#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
+#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
+#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
+#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av "
-#~ "en annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla "
-#~ "ditt primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv "
-#~ "kommer att tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att "
-#~ "acceptera det nya tillståndet på servern och radera ditt primitiv."
-#~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
-
+#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av en "
+#~ "annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla ditt "
+#~ "primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv kommer att "
+#~ "tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att acceptera det "
+#~ "nya tillståndet på servern och radera ditt primitiv.<br>Klicka "
+#~ "<strong>{3}</strong> för att avbryta.<br>"
+
+#, java-format
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
+#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
 #~ msgstr ""
-#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för "
-#~ "individuell uppdatering. Vänligen reducera<br>urvalet till max {1} "
-#~ "primitiv.</html>"
+#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för individuell "
+#~ "uppdatering. Vänligen reducera<br>urvalet till max {1} primitiv.</html>"
 
 #~ msgid "Selection too big"
@@ -33394,10 +33500,11 @@
 #~ 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."
@@ -33407,4 +33514,5 @@
 #~ msgstr "Inga data"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33413,23 +33521,25 @@
 #~ msgstr ""
 #~ "<html>Uppladdning <strong>misslyckades</strong> eftersom en primitiv du "
-#~ "försökte<br>ta bort från servern redan är borttagen."
-#~ "<br><br>Felmeddelandet är:<br>{0}</html>"
-
+#~ "försökte<br>ta bort från servern redan är borttagen.<br><br>Felmeddelandet "
+#~ "är:<br>{0}</html>"
+
+#, java-format
 #~ msgid ""
 #~ "<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 "
@@ -33442,4 +33552,5 @@
 #~ msgstr "Felaktigt antal parametrar för nodoperator."
 
+#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -33447,22 +33558,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>."
@@ -33470,19 +33581,23 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A "
+#~ "HREF=\"{1}\">ditt språk</A>."
+
+#, java-format
 #~ msgid "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}."
@@ -33491,4 +33606,5 @@
 #~ 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}"
@@ -33500,13 +33616,17 @@
 #~ msgstr "ingen senaste version funnen. Historiken är tom."
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kunde inte öppna \"{0}\""
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parametern \"{0}\" får inte vara null"
 
+#, 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 "
@@ -33515,2 +33635,6 @@
 #~ "<html>Det finns olösta konflikter i lager ''{0}''.<br>Du måste lösa dem "
 #~ "först.</html>"
+
+#, 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 21602)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 21603)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:43+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 13:12+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-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -90,5 +90,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -260,6 +260,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -314,6 +314,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 ""
 
@@ -337,9 +337,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
@@ -430,6 +430,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -643,12 +643,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1432,5 +1432,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1451,5 +1452,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1599,5 +1600,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 
@@ -1619,5 +1621,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1815,5 +1817,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Birden fazla yol için veya şu yollardan biri için, veya"
 
@@ -1885,9 +1888,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)"
@@ -1904,5 +1907,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2192,6 +2195,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "İndirme sırasında hatalarla karşılaşıldı"
 
@@ -2225,7 +2228,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "İndirme sırasında hatalarla karşılaşıldı"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2358,6 +2361,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 "
@@ -2442,6 +2445,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
@@ -2481,68 +2484,68 @@
 msgstr "<dosyanın sonu>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Ara..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Objeleri ara."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Lütfen bir aramametni giriniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Arama ifadesini girin"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "seçimi değiştiriniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "seçime ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "Seçimden çıkartınız"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "seçimde ara"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "Harf hassas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "ifade anlatımı"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
-msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
-msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2550,38 +2553,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Özel hedefler:</u>"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
-msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2589,5 +2592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2595,11 +2598,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2607,5 +2610,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2613,39 +2620,39 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+msgid "<b>modified</b> - all changed objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgid "<b>selected</b> - all selected objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
-msgid "<b>modified</b> - all changed objects"
+msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
-msgid "<b>selected</b> - all selected objects"
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
-msgid "<b>incomplete</b> - all incomplete objects"
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
-msgid "<b>untagged</b> - all untagged objects"
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2653,11 +2660,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2665,38 +2672,38 @@
 msgstr "Süzgeç"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Arama"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Süzgeç ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Arama Başlat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "''{0}'' için herhangi karşılık bulunamadı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2704,5 +2711,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2710,5 +2717,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2716,5 +2723,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2732,50 +2739,53 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2839,5 +2849,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3045,7 +3055,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 "
@@ -3310,6 +3320,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 ""
 
@@ -3392,5 +3402,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3399,5 +3409,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3406,5 +3416,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3441,5 +3451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3492,5 +3502,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3498,5 +3508,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3504,17 +3514,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "metin"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3522,5 +3526,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3529,5 +3533,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3535,5 +3539,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3541,5 +3545,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3547,42 +3551,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3591,5 +3595,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3597,5 +3601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3648,5 +3652,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3656,81 +3661,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Alan stili yol kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"via\" node or way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "İç yol stili ''{0}'' multipolygon ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Dış yol stili ''{0}'' bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Hata: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3904,5 +3909,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -3972,5 +3978,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3980,5 +3986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3987,5 +3993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3994,5 +4000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4001,5 +4007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4008,5 +4014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4015,9 +4021,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4334,6 +4340,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4348,4 +4354,5 @@
 msgstr "Düzenle"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4538,5 +4545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4575,6 +4582,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 ""
 
@@ -4605,5 +4612,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"
@@ -4612,5 +4619,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"
@@ -4619,5 +4626,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"
@@ -4831,5 +4838,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4854,6 +4862,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4865,5 +4874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr ""
@@ -4908,6 +4917,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 ""
 
@@ -4915,6 +4924,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 ""
 
@@ -4965,6 +4974,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 ""
 
@@ -5181,6 +5190,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5193,6 +5202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5488,7 +5497,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 ""
 
@@ -5513,5 +5522,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5529,6 +5539,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5552,5 +5561,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5558,5 +5567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5629,9 +5638,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<br>Conflict resolutions will not be applied unless all "
+"differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
+"anyway.<strong> Already<br>resolved differences will not be "
+"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
+"conflicts.</html>"
 msgstr ""
 
@@ -5649,13 +5659,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5664,45 +5674,41 @@
 msgstr "Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5929,10 +5935,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6273,4 +6279,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7384,6 +7391,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 ""
 
@@ -7407,8 +7414,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 ""
 
@@ -7528,5 +7535,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7535,23 +7542,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Değerleri Değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7559,5 +7566,5 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7565,77 +7572,81 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Özellikler/Üyelikler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Seçili objenin özellikleri"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Üyesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7750,6 +7761,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 ""
 
@@ -7767,6 +7778,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 ""
 
@@ -7921,6 +7932,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8252,6 +8264,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8311,4 +8324,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8391,6 +8405,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 ""
 
@@ -8400,6 +8414,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 ""
 
@@ -8673,8 +8687,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 
@@ -8689,7 +8704,8 @@
 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 ""
 
@@ -8925,5 +8941,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -8940,5 +8956,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9023,6 +9040,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] ""
@@ -9036,6 +9053,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 "
@@ -9261,5 +9278,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9285,5 +9302,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9338,6 +9356,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 ""
 
@@ -9391,7 +9409,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 ""
 
@@ -9401,5 +9419,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9424,5 +9442,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 
@@ -9640,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 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 ""
 
@@ -9666,7 +9685,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 +9747,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.<br>Eğer izleri "
@@ -9743,5 +9762,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9908,6 +9927,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 ""
 
@@ -9963,7 +9982,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ı "
@@ -10033,64 +10052,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Zamandilimi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "imaj ile GPX izini ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Geçersiz zaman dilimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Geçersiz offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10100,20 +10123,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10122,5 +10145,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10128,21 +10151,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10150,17 +10173,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "GPX izi seçmelisiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "seçili GPX izi yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10171,5 +10194,5 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10222,14 +10245,14 @@
 msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "GPX e göre ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10238,5 +10261,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10245,10 +10268,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10257,5 +10280,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10543,6 +10566,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 ""
 
@@ -10564,8 +10587,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 ""
 
@@ -10685,6 +10708,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 ""
 
@@ -10794,5 +10817,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -10926,8 +10950,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 ""
 
@@ -11010,8 +11034,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 ""
 
@@ -11038,7 +11062,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 ""
 
@@ -11109,34 +11133,30 @@
 msgstr "Aktif ses izini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "GPX dosyası okunurken sessiz imleç oluştur."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Kesin ve geçerli zaman damgalı yol noktaları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Zamanı tahmin edilen kesin yol noktaları, izlerden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "İsimlendirilmiş izler."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Modified times (time stamps) of audio files."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
-msgid "Modified times (time stamps) of audio files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "İzin başlangıcı (başka imleç yoksa hep bu kullanılır)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Asıl araç çubuğundan ses menusunu gizle/göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11144,5 +11164,5 @@
 msgstr "Sesin kayıt edildiği yerde hareketli bir ikonu iz boyunca göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11150,22 +11170,15 @@
 msgstr "Bütünses,görüntü ve web imleçleri metin etiketi yerleştir."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Sesi içeri alırken, imleçler oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "Sesi içeri alırken, herhangi bir yol noktasına GPX tabakasında ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11174,5 +11187,5 @@
 "İsmi veya tanımlaması olan izlerden otomatik olarak ses imleçleri oluştur,"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11180,5 +11193,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11187,17 +11200,17 @@
 "İlgili düğmeye basıldıktan sonra ilieri veya geri atlama zamanı, sn olarak"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "İleri/Geri (saniye)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "Hız ilerleme durumu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Hızlı ilerleme çarpanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11207,13 +11220,13 @@
 "gereklidir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Lead-in zamanı (saniye)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "Asıl kayıt zamanı ile kayıt cihazının kaydettiği zaman arası oran"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Ses kayıt cihazı kalibrasyonu"
@@ -11253,5 +11266,5 @@
 msgstr "Renkler"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11262,34 +11275,34 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Herhangi bir segment içeri alınmadıysa çizgileri zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Geniş gps noktaları çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Velocity (red = slow, green = fast)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
-msgid "Velocity (red = slow, green = fast)"
+msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11297,5 +11310,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11317,5 +11330,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11357,5 +11370,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11369,50 +11382,61 @@
 msgstr "Ayak"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Yön oklarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Hızlı Çizim (kötü görünür)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Sadece yolun başında"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Segment sıra numaralarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "İndirilen alan için sınırları çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Seçim modunda sanal kavşakları çiziniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Pasif tabakaları başka renkte çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Düzgün harita grafikleri (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11420,9 +11444,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11431,25 +11455,26 @@
 "''-1'' yap."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximum uzunluk (metre)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11457,13 +11482,13 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimum uzaklık (pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "GPS noktaları için geniş nokta çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11471,9 +11496,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11481,46 +11506,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS Noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Yol segmentleri için yön ipuçları çiz."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Her segment için kendi yolu buyunca sıra numarası çiz."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula  ."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Server'dan gelen bilginin sınırlarını çiz ."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Pasif tabakaları farklı renklerde çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -11592,5 +11618,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11639,6 +11666,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11715,6 +11742,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 ""
 
@@ -11727,9 +11754,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 ""
 
@@ -12028,6 +12055,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 ""
 
@@ -12149,6 +12176,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 ""
 
@@ -12170,6 +12197,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 ""
 
@@ -12247,5 +12274,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12261,5 +12289,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12353,6 +12382,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 ""
 
@@ -12647,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
@@ -12830,5 +12859,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13213,6 +13243,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 ""
 
@@ -13240,6 +13270,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 ""
 
@@ -13281,5 +13311,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13711,14 +13742,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13727,23 +13763,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13751,5 +13782,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13757,17 +13788,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13775,5 +13806,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13785,42 +13816,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Eklentiyi Pasif Yap"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -13829,5 +13860,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -13836,10 +13867,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -13847,10 +13878,10 @@
 msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Eklenti Yazarın {0} Olduğunu Belirtiyor."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -13858,9 +13889,9 @@
 "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Eklentiyi Pasif Hale Getireyim mi?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13870,14 +13901,14 @@
 "çalıştırın."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "Açıklama mevcut değil"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -13918,5 +13949,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -13978,5 +14010,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"
@@ -14059,6 +14091,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 ""
 
@@ -14066,7 +14098,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 ""
 
@@ -14074,7 +14106,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 ""
 
@@ -14082,8 +14114,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 ""
 
@@ -14103,7 +14135,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 ""
 
@@ -14172,6 +14204,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14183,7 +14216,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 ""
 
@@ -14215,9 +14248,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14880,7 +14913,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -14890,5 +14923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -14898,5 +14931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -14912,5 +14945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -14920,5 +14953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -14949,5 +14982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -14956,5 +14989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -14963,5 +14996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -14970,5 +15003,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -14977,5 +15010,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -14984,5 +15017,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15016,10 +15049,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15493,34 +15527,35 @@
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Kullan"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Kullanmak için şema seçiniz."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Renk Şeması"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Silinecek şemayı seçiniz."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "listeden seçilen şemayı kullan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Aktşf renkleri yeni renk şeması olarak kullan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Seçili şemayı sil."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Renk Şeması"
@@ -15593,5 +15628,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15682,4 +15717,5 @@
 msgstr "Port:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15891,5 +15927,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16010,5 +16046,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Oluşturulan yol için max. segment sayısı. Varsayılan 250."
 
@@ -16031,6 +16068,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Douglas-Peucker hat basitleştirme hassasiyeti, açı olarak verilir.<br>düşük "
@@ -16062,5 +16100,6 @@
 #: ../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
@@ -16343,5 +16382,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr "Başlık çeşitli değerler taşır ve bir metine atanamaz."
 
@@ -16451,5 +16491,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16502,5 +16543,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17318,4 +17360,12 @@
 msgstr ""
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17760,6 +17810,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 ""
 
@@ -17845,8 +17895,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 ""
 
@@ -17900,8 +17950,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 ""
 
@@ -18013,6 +18063,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 ""
 
@@ -18020,6 +18070,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 ""
 
@@ -18661,6 +18711,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"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ı"
@@ -18688,5 +18739,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
 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:776
@@ -18808,5 +18860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -18908,5 +18960,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19283,9 +19335,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19296,10 +19345,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Bakım için database kapalı"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19309,25 +19358,25 @@
 "seçiniz veya planet.osm yi kullanın"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "ses akış dosya linki alınamadı"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr ""
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19335,17 +19384,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "orman"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19353,7 +19402,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19363,5 +19412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19404,5 +19453,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19412,5 +19461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19420,5 +19469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19428,8 +19477,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19443,5 +19492,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19452,5 +19501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19459,7 +19508,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19469,5 +19518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19477,5 +19526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19485,5 +19534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19493,5 +19542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19501,5 +19550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19509,5 +19558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19517,8 +19566,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19528,58 +19577,60 @@
 msgstr "rut"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Seçilebilen Özellikler:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Belirteç yok"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "gerçek İsim"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Stil"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Anasayfa"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "İçeri Zoom"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Yeni Rol"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Daire Oluştur"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Kaydet"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19650,5 +19701,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -19814,6 +19866,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19822,5 +19881,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19829,10 +19888,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19841,5 +19900,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19849,5 +19908,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19856,15 +19915,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19873,5 +19932,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20761,7 +20820,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -20901,8 +20960,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"/>
@@ -21112,5 +21171,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21120,5 +21179,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21137,5 +21196,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21145,5 +21204,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21162,5 +21221,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21170,5 +21229,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21187,5 +21246,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21195,5 +21254,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21208,5 +21267,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21224,5 +21283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21240,5 +21299,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21247,5 +21306,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21255,5 +21314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21273,5 +21332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21280,5 +21339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21288,5 +21347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -21990,5 +22049,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22039,5 +22098,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22134,5 +22193,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22300,5 +22359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22632,5 +22691,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22640,5 +22699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22648,5 +22707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22656,5 +22715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22664,5 +22723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22672,5 +22731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22680,5 +22739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22689,5 +22748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24107,5 +24166,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24115,5 +24174,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24123,5 +24182,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24131,5 +24190,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24493,7 +24552,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24503,5 +24562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24511,5 +24570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24519,5 +24578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24527,5 +24586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24535,5 +24594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24543,5 +24602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24551,5 +24610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24559,5 +24618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24567,5 +24626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24575,5 +24634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24583,5 +24642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24591,5 +24650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24599,5 +24658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24607,5 +24666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24615,5 +24674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24623,5 +24682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24631,5 +24690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24639,5 +24698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24647,5 +24706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24655,5 +24714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24663,5 +24722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24671,5 +24730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24679,5 +24738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24687,5 +24746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24695,5 +24754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24703,5 +24762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24711,5 +24770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24719,5 +24778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24727,5 +24786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24735,5 +24794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24743,5 +24802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24751,5 +24810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24759,5 +24818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24767,5 +24826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24775,5 +24834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24783,5 +24842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24791,5 +24850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24799,5 +24858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24807,5 +24866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24815,5 +24874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24823,5 +24882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24831,5 +24890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24839,5 +24898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24847,5 +24906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24855,5 +24914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24863,5 +24922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26567,7 +26626,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26577,5 +26636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26585,5 +26644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26593,5 +26652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26601,5 +26660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26609,5 +26668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26617,5 +26676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26625,5 +26684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26633,5 +26692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28054,5 +28113,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28068,5 +28127,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28076,5 +28135,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28085,5 +28144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28096,7 +28155,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28106,5 +28165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28114,5 +28173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28122,5 +28181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28130,5 +28189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28162,5 +28221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28176,5 +28235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28184,5 +28243,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28191,5 +28250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28199,5 +28258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28208,5 +28267,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28231,5 +28290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28344,9 +28403,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
@@ -28354,5 +28413,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,
@@ -28362,8 +28421,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
@@ -28377,5 +28436,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28383,5 +28442,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28430,6 +28489,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>
@@ -28509,5 +28568,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28517,11 +28576,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28537,5 +28596,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28544,5 +28603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28551,5 +28610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28565,5 +28624,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28577,5 +28636,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28584,5 +28643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28591,5 +28650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28598,5 +28657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28605,5 +28664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28612,5 +28671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28619,5 +28678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28626,5 +28685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28633,5 +28692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28640,5 +28699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28647,5 +28706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28654,5 +28713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28661,5 +28720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28668,5 +28727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28675,5 +28734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28850,7 +28909,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28864,5 +28923,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -28872,7 +28931,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -28882,5 +28941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -28890,5 +28949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -28898,5 +28957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -28906,5 +28965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -28920,5 +28979,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -28927,5 +28986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -28935,5 +28994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -28942,5 +29001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -28949,5 +29008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -28956,5 +29015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -28963,5 +29022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -28970,5 +29029,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -28977,5 +29036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -28984,5 +29043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -28991,5 +29050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -28998,5 +29057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29010,5 +29069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29022,5 +29081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29029,5 +29088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29041,5 +29100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29054,5 +29113,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29067,5 +29126,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29079,5 +29138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29091,5 +29150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29098,5 +29157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29105,5 +29164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29113,5 +29172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29120,5 +29179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29127,5 +29186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29134,5 +29193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29142,5 +29201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29151,5 +29210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29159,7 +29218,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29169,5 +29228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29177,5 +29236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29185,5 +29244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29194,5 +29253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29201,5 +29260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29209,5 +29268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29217,5 +29276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29225,5 +29284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29233,5 +29292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29241,5 +29300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29249,5 +29308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29257,5 +29316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29265,5 +29324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29273,5 +29332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29294,5 +29353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29307,7 +29366,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29317,5 +29376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29324,5 +29383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29332,5 +29391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29339,5 +29398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29347,5 +29406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29355,5 +29414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29369,5 +29428,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29378,5 +29437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29395,5 +29454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29403,5 +29462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29414,5 +29473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29431,5 +29490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29438,5 +29497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29445,5 +29504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29452,7 +29511,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29463,5 +29522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29476,5 +29535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29488,5 +29547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29496,5 +29555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29508,5 +29567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29520,5 +29579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29527,5 +29586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29534,7 +29593,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29544,5 +29603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29552,5 +29611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29560,5 +29619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29568,5 +29627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29576,5 +29635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29590,7 +29649,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29605,5 +29664,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29618,5 +29677,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29631,5 +29690,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29644,5 +29703,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29657,5 +29716,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29670,7 +29729,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29680,5 +29739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29687,5 +29746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29695,5 +29754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29703,5 +29762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29711,5 +29770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29719,5 +29778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29727,5 +29786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29735,5 +29794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29743,5 +29802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29751,5 +29810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29759,5 +29818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29767,5 +29826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29775,5 +29834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29793,5 +29852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29806,5 +29865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29817,7 +29876,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29827,5 +29886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29835,5 +29894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29843,5 +29902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29851,5 +29910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29859,5 +29918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -29867,5 +29926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -29875,5 +29934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -29883,5 +29942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -29891,5 +29950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -29899,5 +29958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -29907,5 +29966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -29915,5 +29974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -29923,5 +29982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -29931,5 +29990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -29939,5 +29998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -29947,5 +30006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -29967,5 +30026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -29979,7 +30038,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -29989,5 +30048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -29997,5 +30056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30005,5 +30064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30013,5 +30072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30021,5 +30080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30029,5 +30088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30037,5 +30096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30045,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30053,5 +30112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30061,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30078,5 +30137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30086,5 +30145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30094,5 +30153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30102,5 +30161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30110,5 +30169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30118,5 +30177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30126,5 +30185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30134,5 +30193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30142,5 +30201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30150,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30158,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30166,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30183,5 +30242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30190,5 +30249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30198,5 +30257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30205,5 +30264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30213,5 +30272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30221,5 +30280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30229,5 +30288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30236,5 +30295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30244,5 +30303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30252,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30260,5 +30319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30268,5 +30327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30275,5 +30334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30282,5 +30341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30289,5 +30348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30296,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30303,5 +30362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30310,5 +30369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30317,5 +30376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30324,5 +30383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30331,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30338,5 +30397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30345,5 +30404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30352,5 +30411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30359,5 +30418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30367,5 +30426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30375,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30383,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30391,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30399,5 +30458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30407,5 +30466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30415,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30423,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30431,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30440,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30448,5 +30507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30456,5 +30515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30464,5 +30523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30472,5 +30531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30480,5 +30539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30488,5 +30547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30496,5 +30555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30504,5 +30563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30512,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30520,5 +30579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30528,5 +30587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30536,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30544,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30552,5 +30611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30560,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30568,5 +30627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30576,5 +30635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30584,5 +30643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30592,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30599,5 +30658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30629,5 +30688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30637,5 +30696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30645,7 +30704,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30660,5 +30719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30668,5 +30727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30676,5 +30735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30684,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30692,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30700,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30708,5 +30767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30722,7 +30781,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30732,5 +30791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30740,5 +30799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30748,5 +30807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30756,5 +30815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30764,5 +30823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30772,5 +30831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30780,5 +30839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30788,5 +30847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30796,5 +30855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30804,5 +30863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30812,5 +30871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30820,5 +30879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30828,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30836,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30844,5 +30903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30852,5 +30911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30860,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -30868,5 +30927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -30876,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -30884,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -30892,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -30900,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -30908,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -30916,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -30924,5 +30983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -30932,5 +30991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -30940,5 +30999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -30948,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -30956,5 +31015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -30964,5 +31023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -30972,5 +31031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -30980,5 +31039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -30988,5 +31047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -30996,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31004,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31012,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31020,5 +31079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31028,5 +31087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31036,5 +31095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31044,5 +31103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31052,5 +31111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31060,5 +31119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31094,7 +31153,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31104,5 +31163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31112,5 +31171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31120,5 +31179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31128,5 +31187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31136,5 +31195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31144,5 +31203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31152,5 +31211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31167,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31175,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31183,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31191,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31199,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31207,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31216,5 +31275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31224,5 +31283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31232,5 +31291,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31240,5 +31299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31247,5 +31306,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31254,5 +31313,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31270,7 +31329,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31280,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31288,5 +31347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31296,5 +31355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31304,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31312,5 +31371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31320,5 +31379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31328,5 +31387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31336,5 +31395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31344,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31360,5 +31419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31372,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31384,5 +31443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31392,5 +31451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31404,5 +31463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31416,6 +31475,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31425,5 +31484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31437,5 +31496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31449,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31461,5 +31520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31473,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31485,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31493,7 +31552,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31503,5 +31562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31511,5 +31570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31519,5 +31578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31527,5 +31586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31542,5 +31601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31553,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31565,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31577,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31589,5 +31648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31598,5 +31657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31606,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31614,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31622,5 +31681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31630,5 +31689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31645,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31657,5 +31716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31669,5 +31728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31681,5 +31740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31693,5 +31752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31706,5 +31765,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?
@@ -31730,5 +31789,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31739,11 +31798,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31753,5 +31812,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31761,5 +31820,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31769,5 +31828,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31777,5 +31836,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31785,5 +31844,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31793,5 +31852,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31801,5 +31860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31809,5 +31868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31817,5 +31876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31825,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31833,5 +31892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31841,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31859,5 +31918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -31952,5 +32011,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -31958,28 +32017,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
@@ -32094,5 +32153,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32105,5 +32164,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>
@@ -32128,6 +32187,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32136,6 +32195,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32150,6 +32209,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
@@ -32163,6 +32222,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
@@ -32182,6 +32241,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32205,6 +32264,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
@@ -32225,4 +32284,5 @@
 #~ 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"
@@ -32232,6 +32292,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 "
@@ -32251,6 +32311,5 @@
 #~ "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"
@@ -32281,4 +32340,5 @@
 #~ msgstr "Enter Password"
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Eklenti Bulunamadı: {0}."
@@ -32312,4 +32372,5 @@
 #~ 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"
@@ -32340,8 +32401,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 "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Yazarlar: {0}"
@@ -32350,4 +32412,5 @@
 #~ msgstr "Seçili tabakayı sil."
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Komut Yığını: {0}"
@@ -32359,4 +32422,5 @@
 #~ msgstr "sism"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "{0} için görüntüler"
@@ -32365,7 +32429,9 @@
 #~ 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ı"
@@ -32374,10 +32440,13 @@
 #~ 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"
@@ -32387,4 +32456,5 @@
 #~ msgstr[0] "görüntü"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} izde var."
@@ -32393,7 +32463,9 @@
 #~ 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."
@@ -32420,6 +32492,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."
@@ -32435,4 +32507,5 @@
 #~ msgstr "site-josm.xml veya Wiki Pages ekle."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32467,4 +32540,7 @@
 #~ msgstr "Proxy server şifresi"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "GPX dosyası okunurken sessiz imleç oluştur."
+
 #~ msgid "<p>Thank you for your understanding</p>"
 #~ msgstr "<p>Anlayışınız için teşekkürler</p>"
@@ -32477,6 +32553,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32487,14 +32562,16 @@
 #~ 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:"
@@ -32513,4 +32590,5 @@
 #~ msgstr "Dosya bulunamadı"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32522,10 +32600,11 @@
 #~ " {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 ."
@@ -32541,11 +32620,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?"
+#~ "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"
@@ -32558,4 +32636,5 @@
 #~ msgstr "farklı"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32574,22 +32653,29 @@
 #~ msgstr "EPSG:4326"
 
+#, 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."
@@ -32599,6 +32685,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 "
@@ -32623,10 +32709,13 @@
 #~ 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}\""
@@ -32639,9 +32728,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."
@@ -32699,9 +32788,8 @@
 #~ "Devam etmek istiyormusunuz?"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "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?"
 
@@ -32758,4 +32846,5 @@
 #~ msgstr "Metacarta Map Rectifier imaj id"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -32771,6 +32860,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 "
@@ -32787,6 +32876,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"
@@ -32795,6 +32884,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 "
@@ -32805,14 +32894,13 @@
 #~ "\n"
 #~ "Tam WMS link formatı örnek (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
-#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/"
-#~ "jpeg\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style"
+#~ "s=&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&Version=1.1.0&Request=GetMap&\n"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V"
+#~ "ersion=1.1.0&Request=GetMap&\n"
 #~ "format=image/png"
 
@@ -32910,4 +32998,5 @@
 #~ msgstr "Para Değişim"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}."
@@ -32952,4 +33041,5 @@
 #~ 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"
@@ -32962,6 +33052,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 "
@@ -32974,17 +33064,21 @@
 #~ 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."
-
+#~ "Yardım sayfası yok. <A HREF=\"{0}\">English</A> ya da <A "
+#~ "HREF=\"{1}\">türkçe</A> olarak oluştur."
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parametre ''{0}'' zero (null) olamaz"
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Okunamadı \"{0}\""
@@ -32993,4 +33087,8 @@
 #~ msgstr "Seçimi Güncelle"
 
+#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Id > 0 gerekiyordu, {0} elde edildi"
+
+#~ msgid "Errors during Download"
+#~ msgstr "İndirme sırasında hatalarla karşılaşıldı"
Index: /applications/editors/josm/i18n/po/uk.po
===================================================================
--- /applications/editors/josm/i18n/po/uk.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/uk.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-02 06:58+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-05 13:50+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-02 08:35+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-07 06:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -99,5 +99,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
@@ -242,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -251,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:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -265,6 +266,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -321,9 +322,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
@@ -346,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
@@ -439,6 +440,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -599,5 +600,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
@@ -651,12 +653,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1066,5 +1068,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
@@ -1234,6 +1237,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
@@ -1303,6 +1306,6 @@
 "точки. Тоді напрямок буде змінено згідно до цих опорних точок. (Пізніше, ви "
 "можете відмінити переміщення певних точок:<br>Виберіть їх та натисніть "
-"комбінацію клавіш для дій \"Зробити прямі кути / Відмінити\". Типово це Shift"
-"+Q.)"
+"комбінацію клавіш для дій \"Зробити прямі кути / Відмінити\". Типово це "
+"Shift+Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1352,6 +1355,6 @@
 "<html>Ви використовуєте проекцію EPSG:4326, що може призвести<br>до "
 "небажаних результатів при позиціонуванні прямокутних форм.<br>Змініть "
-"проекцію щоб позбутись цього попередження.<br>Чи бажаєте ви продовжити?</"
-"html>"
+"проекцію щоб позбутись цього попередження.<br>Чи бажаєте ви "
+"продовжити?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1382,5 +1385,6 @@
 #: ../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
@@ -1480,5 +1484,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1499,5 +1504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1649,5 +1654,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Показує звіт про стан, що містить корисну інформацію, яку можна прикріпити "
@@ -1671,5 +1677,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1821,6 +1827,6 @@
 msgstr ""
 "<html>Роль, заснована на участі у зв’язках, була скопійована у всі нові "
-"лінії.<br>Результат необхідно перевірити і виправити, якщо буде потрібно.</"
-"html>"
+"лінії.<br>Результат необхідно перевірити і виправити, якщо буде "
+"потрібно.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1890,5 +1896,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Одна точка, що використовується декількома лініям та одною з цих ліній, або"
@@ -1963,9 +1970,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)"
@@ -1982,5 +1989,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2042,6 +2049,6 @@
 "''{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
@@ -2292,7 +2299,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Помилки під час отримання даних"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Помилки під час отримання даних з сервера"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2328,7 +2335,7 @@
 msgstr "({0}/{1}) Завантаження батьків зв’язку {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Помилки під час отримання даних з сервера"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2467,6 +2474,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 ""
 "Перетягніть повзунок до треку для його програвання з відповідного місця; "
@@ -2558,7 +2565,7 @@
 "move zoom with right button"
 msgstr ""
-"Зміна масштабу коліщатком миші, чи Ctrl+. або Ctrl+,; пересування мапи — Ctrl"
-"+стрілки (вгору/вниз/праворуч/ліворуч) або перетягуйте за допомогою правої "
-"кнопки миші"
+"Зміна масштабу коліщатком миші, чи Ctrl+. або Ctrl+,; пересування мапи — "
+"Ctrl+стрілки (вгору/вниз/праворуч/ліворуч) або перетягуйте за допомогою "
+"правої кнопки миші"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2598,70 +2605,70 @@
 msgstr "<end-of-file>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Пошук…"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Пошук об’єктів"
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Будь ласка, введіть рядок фільтра."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Будь ласка, введіть рядок для пошуку."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Введіть вираз для пошуку"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "замінити виділене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "додати до виділеного"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "прибрати з виділеного"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "знайти у виділеному"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "з врахуванням регістру"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "регулярний вираз"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 "<b>Baker Street</b> — ''Baker'' та ''Street'' у будь-якому ключі чи назві."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> — ''Baker Street'' у будь-якому ключі чи назві."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> — ''Bak'' будь-де в назві."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> — ключ ''type'' з точним значенням ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2671,41 +2678,41 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> — назва не містить ''Bak''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> — oneway=yes, true, 1 чи on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> — key=foot встановити в будь-яке значення."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Спеціальні цілі:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b>object_type, де object_type — <b>node</b>(точка), <b>way</b>"
-"(ліния), <b>relation</b>(зв’язок)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+"<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:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>… — всі об’єкти, змінені користувачем"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> — все об’єкти, змінені анонімним користувачем"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 "<b>id:</b>… — об’єкт із зазначеним ідентифікатором (0 для нових об’єктів)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2715,5 +2722,5 @@
 "встановленої версії)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2723,13 +2730,13 @@
 "об’єктів, без призначеного набору змін)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
 msgstr ""
 "<b>nodes:</b>… — об’єкт із зазначеною кількістю точок (nodes:кількість або "
 "nodes:мін-макс)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2739,5 +2746,9 @@
 "tags:мін-макс)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr "<b>роль:</b>… — об’єкт із зазначеною роллю у зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2747,38 +2758,38 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> або <b>T14:51</b> …)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> — усі змінені об’єкти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> — усі виділені об’єкти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> — всі неповні об’єкти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> — всі об’єкти без теґів"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+"<b>child <i>вираз</i></b> — усі нащадки, об’єктів що відповідають виразу"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+"<b>parent <i>вираз</i></b> — усі батьки, об’єктів що відповідають виразу"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr ""
+"Використовуйте <b>|</b> або <b>OR</b> щоб об’єднати вираження логічним «або»"
+
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>вираз</i></b> — усі нащадки, об’єктів що відповідають виразу"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>вираз</i></b> — усі батьки, об’єктів що відповідають виразу"
-
-#: ../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> щоб об’єднати вираження логічним «або»"
-
-#: ../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 ""
@@ -2786,5 +2797,5 @@
 "містить <b>:</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2794,11 +2805,11 @@
 "ставити додатковий зворотній слеш (ось так: <b>\\\"</b> и <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Використовуйте <b>(</b> та <b>)</b> для групування виразів"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2806,38 +2817,38 @@
 msgstr "Фільтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Пошук"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Додати фільтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Почати пошук"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не знайдено збігів для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "До виділеного нічого не додано в результаті пошуку ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Нічого не вилучено з виділеного в результаті пошуку ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "У виділеному нічого не знайдено під час пошуку ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2845,5 +2856,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2851,5 +2862,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2857,5 +2868,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2873,5 +2884,16 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+"Помилка розбору регулярного виразу \"{0}\":\n"
+"\n"
+"{1}"
+
+#: ../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 ""
@@ -2879,10 +2901,5 @@
 "використання: ключ=значення"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2890,36 +2907,36 @@
 "Невідомий тип елементу: {0}. Дозволені значення: точка, лінія або зв’язко"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "епередбачений елемент. Очікувалось {0}, знайдено {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Непередбачена конструкція: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "Відсутній параметр для OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "Відсутній параметр для NOT"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "Очікується ідентифікатор елемента"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "Очікується діапазон чисел"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "Очікується ідентифікатор набору змін"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "Очікується версія"
@@ -2990,5 +3007,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3102,6 +3119,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
@@ -3205,11 +3222,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:459
@@ -3491,6 +3508,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> Цей файл буде збережено як "
@@ -3585,5 +3602,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3592,5 +3609,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3599,5 +3616,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3632,7 +3649,8 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
-msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+msgstr ""
+"Неможливо додати елемент {0} до набору даних, так як він вже присутній"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3691,5 +3709,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3697,5 +3715,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3703,17 +3721,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "Текст"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3721,5 +3733,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3728,5 +3740,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3734,5 +3746,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3740,5 +3752,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3746,42 +3758,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фільтр активний</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> об’єктів приховано"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> об’єктів пошкоджено"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об’єкти.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Елемент з ідентифікатором =0 не може бути видимий."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Очікується ідентифікатор >0. Маємо {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Очікується версія >0. Маємо {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3792,5 +3804,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3798,5 +3810,5 @@
 msgstr "Об’єднання неможливе, тому що частина елементів нові, а частина ні"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3859,5 +3871,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "Неможливо порівняти елементи з ідентифікаторами ''{0}'' та ''{1}''."
 
@@ -3867,81 +3880,81 @@
 msgstr "Параментр {0} не в діапазоні 0..{1}, його значення {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Лінія, що показує межу ділянки, не замкнена."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Виявлено більше ніж одну лінію \"від\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Виявлено більше ніж одну лінію \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Виявлено більше ніж один елемент \"через\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Невідома роль ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Невідомий тип члегна ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Лінію «від» не знайдено."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Лінію «до» не знайдено."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Не знайдено точку чи ліню що є елементами «через»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "Лінія «з» не починається/закінчується у точці «через»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "Лінія «до» не починається/закінчується у точці «через»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Лінія «з» не починається/закінчується на лінії «через»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "Лінія «до» не починається/закінчується на лінії «через»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для обмеження {0} не знайдено."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Помилка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -4117,6 +4130,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
@@ -4187,5 +4202,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4195,5 +4210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4202,5 +4217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4209,5 +4224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4216,5 +4231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4223,5 +4238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4230,9 +4245,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4349,5 +4364,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
@@ -4567,6 +4583,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4581,4 +4597,5 @@
 msgstr "Правити"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4681,6 +4698,6 @@
 "this list with the mouse.<hr>"
 msgstr ""
-"Натисніть на середню клавішу ще раз, щоб активувати на наступний елемент."
-"<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
+"Натисніть на середню клавішу ще раз, щоб активувати на наступний "
+"елемент.<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
@@ -4739,6 +4756,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
@@ -4780,5 +4797,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4819,11 +4836,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
@@ -4854,5 +4871,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"
@@ -4861,5 +4878,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"
@@ -4868,5 +4885,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"
@@ -5070,5 +5087,6 @@
 #: ../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
@@ -5095,5 +5113,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Скопіювати чужі виділені елементи в кінець списку об’єднаних елементів."
@@ -5123,6 +5142,7 @@
 msgstr "Копіювати всі чужі елементи в місце призначення"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -5134,5 +5154,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Вниз"
@@ -5177,6 +5197,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>, щоб почати об’єднання моїх записів з "
@@ -5186,6 +5206,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>, щоб закінчити об’єднання моїх записів з "
@@ -5245,6 +5265,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>"
@@ -5485,6 +5505,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5497,6 +5517,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5749,6 +5769,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
@@ -5763,7 +5783,8 @@
 "<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
@@ -5778,7 +5799,8 @@
 "<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
@@ -5813,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>Виберіть для показу набори правок тільки вибраних об’єктів.<br>Скиньте "
@@ -5840,5 +5862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr "Завантажити дані про виділені набори змін з сервера OSM"
 
@@ -5856,6 +5879,5 @@
 msgstr "Відкрити веб-сторінки для кожного виділеного набору змін"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5879,5 +5901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5885,5 +5907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5959,16 +5981,17 @@
 #, 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
@@ -5985,13 +6008,13 @@
 msgstr "Розв’язати кнофлікти для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "Відфільтрувати об’єкти і приховати/відключити їх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -6000,45 +6023,41 @@
 msgstr "Додати"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "Додати фільтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "Редагувати фільтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "Вилучити фільтр."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "Перемістити фільтр вгору."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "Перемістити фільтр вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "Увімкнути фільтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "Приховати елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "Застосувати також для нащадків"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "Інвертувати фільтр"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "Режим фільтра"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6196,5 +6215,6 @@
 #: ../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
@@ -6265,10 +6285,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "Вибрати зі списку зв’язків"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "Вибрати зв’язок зі списку зв’язків"
@@ -6570,6 +6590,6 @@
 "''{0}''.</html>"
 msgstr[0] ""
-"<html>Обраний об’єкт не доступний у поточному<br> редагованому шарі ''{0}''."
-"</html>"
+"<html>Обраний об’єкт не доступний у поточному<br> редагованому шарі "
+"''{0}''.</html>"
 msgstr[1] ""
 "<html>Жоден з виділених об’єктів не доступний у поточному<br>редагованому "
@@ -6626,4 +6646,5 @@
 msgstr "Ідентифікатор"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7571,5 +7592,6 @@
 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
@@ -7761,9 +7783,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
@@ -7773,6 +7795,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
@@ -7785,18 +7807,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
@@ -7924,5 +7946,5 @@
 msgstr "Недійсний URL запиту отримання набору змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7932,23 +7954,23 @@
 msgstr[2] "Це змінить {0} об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "Пусте значення вилучає теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<інший>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Змінити значення?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7958,5 +7980,5 @@
 msgstr[2] "Зміна властивостей {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7966,77 +7988,81 @@
 msgstr[2] "Це змінить до {0} об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Будь ласка, оберіть ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Будь ласка, оберіть значення"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Будь ласка, оберіть об’єкти для зміни параметрів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Параметри/Членство"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Параметри обраних об’єктів."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Член групи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr "Розташування"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Додати параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Параметрів: {0} / Членів: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Параметри / Члени"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Змінити зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Вилучити із зв’язку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Справді стерти обране зі зв’язку {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "Вилучити обраний ключ зі всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Вилучити параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "Додати нову пару ключ/значення до всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "Правити значення обраного ключа для всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "Вибрати зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "Вибрати зв’язок із основного виділення"
@@ -8158,9 +8184,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>"
 
@@ -8178,10 +8204,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
@@ -8197,6 +8223,6 @@
 msgstr ""
 "<html>Ви намагаєтесь додати зв’язок самого до себе.<br><br>Це створить "
-"циклічне посилання і тому не рекомендується.<br>Пропустити зв’язок ''{0}''.</"
-"html>"
+"циклічне посилання і тому не рекомендується.<br>Пропустити зв’язок "
+"''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
@@ -8354,6 +8380,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 "<html>Шар ''{0}'' має конфлікт для елементу<br>''{1}''.<br>Будь ласка "
@@ -8701,10 +8728,11 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<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
@@ -8763,4 +8791,5 @@
 msgstr "Запит до сервера імен…"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8843,14 +8872,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
@@ -8859,11 +8888,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
@@ -8966,5 +8995,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
@@ -8981,9 +9011,11 @@
 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
@@ -9058,6 +9090,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
@@ -9152,8 +9184,9 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Надсилання на сервер <strong>не вдалося<strong> так як на сервері є "
@@ -9161,8 +9194,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
@@ -9176,13 +9209,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html><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
@@ -9223,6 +9257,6 @@
 msgstr ""
 "<html>Надсилання на сервер <strong>не вдалась</strong>, тому що ви "
-"намагались вилучити точку {0}, яка ще використовується в лінії {1}."
-"<br><br>Натисніть <strong>{2}</strong>, щоб завантажити з сервера всі "
+"намагались вилучити точку {0}, яка ще використовується в лінії "
+"{1}.<br><br>Натисніть <strong>{2}</strong>, щоб завантажити з сервера всі "
 "батьківські лінії точки {0}.<br>Якщо потрібно, JOSM створить конфлікти, які "
 "потім зможете врегулювати у вікні розв’язання конфліктів.</html>"
@@ -9314,5 +9348,6 @@
 #: ../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
@@ -9363,5 +9398,6 @@
 #: ../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
@@ -9445,5 +9481,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "Відкрити діалог вибору файлу"
@@ -9460,5 +9496,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr "В шарі ''{0}'' є зміни, які потрібно надіслати на сервер."
 
@@ -9555,6 +9592,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>Або "
@@ -9575,6 +9612,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 "
@@ -9823,5 +9860,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9851,6 +9888,8 @@
 
 #: ../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
@@ -9916,13 +9955,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>кількох наборах "
@@ -9982,13 +10021,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
@@ -9997,5 +10036,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -10025,5 +10064,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Ігнорування виявленого виключення, тому що надсилання на сервер скасовано. "
@@ -10262,7 +10302,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>Так як точки не "
@@ -10290,11 +10330,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:373
@@ -10360,6 +10400,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Надсилання на сервер необроблених даних GPS під виглядом даних мапи "
@@ -10375,5 +10415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10410,5 +10450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "track only"
-msgstr "тфльки треки"
+msgstr "тільки треки"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
@@ -10426,6 +10466,6 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. Продовжити?</"
-"html>"
+"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. "
+"Продовжити?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1126
@@ -10562,10 +10602,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
@@ -10629,7 +10669,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>Покажіть "
@@ -10701,64 +10741,68 @@
 msgstr "Авто-вгадування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "Ручне налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr "Перевстановити позицію для: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Зображення з координатами місця розташування в даних exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Зображення, які вже позначені ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "Показувати ескіз зображення на мапі"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Часовий пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Зміщення:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Зіставити зображення з GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Узгодити"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Невірний часовий пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Невірне зміщення"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "Спробувати знову"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr "Немає відповідних зображень!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "gpx не виділено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10769,20 +10813,20 @@
 msgstr[2] "<html><b>{0}</b> з <b>{1}</b> фото відповідає треку GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовий пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Хвилини: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10792,5 +10836,5 @@
 msgstr[2] "Розбіжність у часі {0} днів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10800,21 +10844,21 @@
 "вручну зіставити фотографії за допомогою повзунків."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "Не вдалося зіставити фотографії з треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Налаштування часового поясу і зсуву"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "Вибрані фотографії не містять інформацію про час."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Фотографії не містять інформацію про час."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10824,17 +10868,17 @@
 "інший."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX Трек не має інформації про час"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "Ви повинні вибрати трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Трек GPX не виділено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10845,5 +10889,5 @@
 "Очікуваний формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10896,14 +10940,14 @@
 msgstr "Помилка читання файлів з каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Зображення з геотеґами"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Відносяться до GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10913,5 +10957,5 @@
 msgstr[2] "Завантажено {0} зображень."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10921,10 +10965,10 @@
 msgstr[2] "{0} знайдено, з GPS позначками."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Вилучити зображення з диску"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10935,5 +10979,5 @@
 "втрачено!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr "Не можливо вилучити файл зображення"
@@ -11242,6 +11286,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>Запустити автоматичну процедуру отримання мітки доступу з веб-сайту "
@@ -11273,8 +11317,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>не "
@@ -11388,7 +11432,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
@@ -11415,6 +11459,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. "
@@ -11537,5 +11581,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 "Збій автентифікації користувача ''{0}'' з паролем «***», як користувача OAuth"
@@ -11614,5 +11659,6 @@
 #: ../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
@@ -11676,8 +11722,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 тепер відкриє сторінку "
@@ -11705,6 +11751,6 @@
 msgstr ""
 "<html>JOSM успішно отримав мітку доступу. Ви можете прийняти її. JOSM буде "
-"використовувати його для автентифікації та авторизації на сервері OSM."
-"<br><br>Мітка доступу: </html>"
+"використовувати його для автентифікації та авторизації на сервері "
+"OSM.<br><br>Мітка доступу: </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
@@ -11779,8 +11825,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>Однак, тест "
@@ -11818,11 +11864,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
@@ -11892,34 +11938,30 @@
 msgstr "Показати звукові підказки у реальному часі"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Створити не звукові мітки при обробці GPX даних"
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Точні точки шляху з дійсними часовими відбитками."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Точні точки шляху з орієнтовним часом з позиції на треку."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Іменовані точки треку."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Змінений час (часові відбитки) аудіо-файлів."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "Початок треку (завжди встановлювати, якщо інші мітки відсутні)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "Показати або сховати меню роботи зі звуком на панелі Головного меню."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11929,5 +11971,5 @@
 "відтворюється."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11937,18 +11979,10 @@
 "на їх значках."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Автоматично створювати шар міток з будь-яких точок шляху при відкритті GPX "
-"шару."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "При імпортуванні звуку, створювати мітки з…"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
@@ -11956,6 +11990,6 @@
 "шару GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11965,5 +11999,5 @@
 "шляху) з іменами або описами."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11973,5 +12007,5 @@
 "імпортованого звукового файлу WAV."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11981,18 +12015,18 @@
 "відповідної кнопки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Вперед/Назад час (в секундах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 "Показує, у скільки разів збільшується швидкість при швидкому програванні"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Коефіцієнт швидкого програвання"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -12002,13 +12036,13 @@
 "від’ємного значення) запитаної позиції аудіозапису"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Тривалість вступу (у секундах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr "Відношення часу диктофонного запису до дійсно витраченого часу"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Калібрування звукозапису"
@@ -12048,5 +12082,5 @@
 msgstr "Кольори"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12057,35 +12091,36 @@
 msgstr "Всі"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "Локальні файли"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "Нічого"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Показувати лінії, навіть якщо немає імпортованих відрізків."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Показувати GPS великими точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 "Показати значення HDOP (зниження точності в горизонтальній площині) колом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Швидкість (червоний = повільно, зелений = швидко)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним кольором (може бути визначено для іменованих шарів)"
@@ -12093,5 +12128,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12113,5 +12148,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12153,5 +12188,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12165,16 +12200,16 @@
 msgstr "Пішки"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Показувати стрілки напрямку"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Швидке креслення (виглядає гірше)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12183,34 +12218,46 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Тільки на початку лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Показувати порядкові номери відрізків"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Показувати межі завантажених даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Показувати віртуальні точки в режимі вибору"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Показувати неактивні шари іншим кольором"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Згладжені лінії (антіаліасінг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr "Створювати мітки читаючи GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Автоматично створювати шар міток з будь-яких точок шляху при відкритті GPX "
+"шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "Показувати лінії між точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12220,9 +12267,9 @@
 "щоб показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальна довжина для локальних файлів (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12231,21 +12278,23 @@
 "показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Максимальна довжина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
-msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+msgstr ""
+"Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Показувати стрілки на лініях, що з’єднують точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Показувати стрілки напрямку, використовуючи таблиці, замість математичних "
@@ -12253,5 +12302,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12260,13 +12309,13 @@
 "Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Мінімальна відстань (в пікселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "Показувати точки GPS великими."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12276,9 +12325,9 @@
 "Менеджері Шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Позначати колір відрізків та точок треку в залежності від швидкості."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12288,37 +12337,39 @@
 "Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+msgstr ""
+"Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Забарвлення треку та точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Показувати напрямок на відрізках ліній."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показувати порядкові номери на всіх відрізках лінії."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Застосувати згладжування мапи."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Показувати межі ділянки, завантаженої з сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12326,9 +12377,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "Показувати неактивні шари даних іншим кольором."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "Дані OSM"
@@ -12400,10 +12451,13 @@
 #: ../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
@@ -12449,6 +12503,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "Оновити втулки"
@@ -12529,6 +12583,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>Більш того, сполучення клавіші активізуються відразу, якщо вони "
@@ -12545,9 +12599,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>Ви можете помітити, що список вибраних клавіш на наступній сторінці, "
@@ -12557,10 +12611,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
@@ -12728,5 +12782,6 @@
 #, 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
@@ -12861,9 +12916,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:766
@@ -12994,6 +13049,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>Будь "
@@ -13019,6 +13074,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}''. "
@@ -13115,5 +13170,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 "Попередження: Не вдалося отримати мітку доступу OAuth від менеджера "
@@ -13135,5 +13191,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 "Ви вже маєте мітку доступу для доступу до сервера OSM за допомогою OAuth."
@@ -13166,5 +13223,6 @@
 #, 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
@@ -13190,5 +13248,6 @@
 #: ../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
@@ -13232,6 +13291,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 ""
 "Використовувати стандартні системні налаштування (заблоковано. Запустіть "
@@ -13482,5 +13541,6 @@
 #, 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
@@ -13553,10 +13613,11 @@
 #. 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
@@ -13743,5 +13804,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 "Елемент з ідентифікатором {0} відсутній у локальній базі даних. Не можу "
@@ -13868,5 +13930,6 @@
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr "Сервер повернув неочікуваний формат ідентифікатора. Отримано ''{0}''."
+msgstr ""
+"Сервер повернув неочікуваний формат ідентифікатора. Отримано ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
@@ -14161,6 +14224,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>Помилка: "
@@ -14190,6 +14253,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}'', "
@@ -14234,5 +14297,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 "Неприпустиме значення атрибуту ''ref'' у члена зв’язку {0}. Отримано {1}"
@@ -14699,21 +14763,27 @@
 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>Вам "
 "треба оновити JOSM, якщо ви бажаєте користуватись цим втулком.</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Не вдалося завантажити втулок {0}. Вилучити його з налаштувань?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr "завантаження втулка ''{0}'' (версія {1})"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -14724,23 +14794,18 @@
 "''{1}'' не знайдено.<br>Вилучити його з налаштувань?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Не вдалося завантажити втулок {0}. Вилучити його з налаштувань?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "Завантаження втулків…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr "Перевірка попередніх умов втулків…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Завантаження втулка ''{0}''…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14749,5 +14814,5 @@
 msgstr[2] "JOSM не міг знайти інформацію про наступні втулки:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14756,17 +14821,17 @@
 msgstr[2] "Втулки не будуть завантажені."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr "Визначити втулки для завантаження…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr "Видалення застарілих втулків…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr "Вилучення втулків без супроводу…"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14775,5 +14840,5 @@
 msgstr[2] "Оновлення наступних втулків не вдалося:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14792,42 +14857,42 @@
 "оновити їх вручну."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr "Не вдалося оновити втулок"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr "Попередження: не вдалося завантажити інформаційний список втулків"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Вимкнути втулок"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Натисніть, щоб вилучити втулок ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "Залишити втулок"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Натисніть, щоб залишити втулок ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr "Попередження: не вдалося вилучити застарілий втулок ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14838,5 +14903,5 @@
 "установки. JOSM все ще може завантажити стару версію втулка."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14847,10 +14912,10 @@
 "файлу ''{1}''. Перейменування не вдалось."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Натисніть, щоб відключити втулок ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -14858,10 +14923,10 @@
 msgstr "Виникла неочікувана помилка, яка викликана втулком ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Відповідно до інформації з втулка, автором є {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14870,9 +14935,9 @@
 "помилку."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Вимкнути втулок?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14882,14 +14947,14 @@
 "вивантажити втулок."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "Інформація про втулок"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "немає опису"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14912,5 +14977,6 @@
 #, 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
@@ -14932,5 +14998,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 "Попередження: Не вдалося сканування файлу ''{0}'' для отримання інформації "
@@ -14998,5 +15065,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"
@@ -15080,7 +15147,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
@@ -15093,6 +15160,6 @@
 "<html><strong>Не вдалось</strong> вилучити <strong>зв’язок {0}</strong>. Він "
 "все ще посилається на зв’язок {1}.<br>Будь ласка, завантажте зв’язок {1}, "
-"вилучіть посилання на зв’язок {0}, після чого знов наділіть дані на сервер.</"
-"html>"
+"вилучіть посилання на зв’язок {0}, після чого знов наділіть дані на "
+"сервер.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -15100,27 +15167,28 @@
 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}'' не "
@@ -15131,12 +15199,13 @@
 #, 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
@@ -15157,7 +15226,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>містить "
@@ -15222,6 +15291,7 @@
 "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
@@ -15246,6 +15316,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 "<html>Сервер OSM<br>''{0}''<br>повідомив про внутрішню помилку.<br>Швидше за "
@@ -15259,7 +15330,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 ""
 "Ділянка, яку ви намагалися завантажити є занадто великою або ваш запит був "
@@ -15292,7 +15363,8 @@
 "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
@@ -15301,6 +15373,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>Надсилання не "
@@ -15309,5 +15381,5 @@
 "об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -16016,7 +16088,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16026,5 +16098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16034,5 +16106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16048,5 +16120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16056,5 +16128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16085,5 +16157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16092,5 +16164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16099,5 +16171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16106,5 +16178,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16113,5 +16185,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16120,5 +16192,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -16152,17 +16224,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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.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
@@ -16670,34 +16744,35 @@
 msgstr "Помилка кешу зони Lambert"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Використати"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Будь ласка, оберіть схему що буде використовуватись."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Схема кольорів"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Будь ласка, оберіть схему для вилучення."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Використовувати обрану схему зі списку"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "Використовувати поточні кольори в якості нової колірної схеми."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Вилучити обрану схему зі списку."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Колірні схеми"
@@ -16772,5 +16847,5 @@
 msgstr "Шар для редагування GPX треків"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Перетворити на GPX шар зі знеособленим часом"
@@ -16861,4 +16936,5 @@
 msgstr "Порт:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16924,6 +17000,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
@@ -17071,5 +17147,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17190,5 +17266,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Максимальна кількість відрізків у створюваних лініях. Початкове значення — "
@@ -17213,6 +17290,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Точність апроксимації Дугласа-П’юкера для спрощення ліній, вимірювана в "
@@ -17537,5 +17615,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Заголовок містить кілька значень і не може бути представлений  одним рядком"
@@ -17650,5 +17729,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 "У вас є не збережені зміни у вашій черзі. Ви хочете відправити їх зараз?"
@@ -17702,5 +17782,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 "Записати інформацію про місце знаходження в exif-розділ наступних файлів:"
@@ -18041,5 +18122,6 @@
 #: ../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
@@ -18529,4 +18611,12 @@
 msgstr "Ряд будинків по вулиці"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr "Огляд"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr "Оглядати мапу використовуючи ліву кнопку миші"
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -18585,6 +18675,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
@@ -18653,5 +18743,6 @@
 #: ../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
@@ -19019,9 +19110,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
@@ -19116,13 +19207,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
@@ -19181,15 +19272,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
@@ -19315,18 +19406,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
@@ -19707,7 +19798,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
@@ -19832,5 +19923,6 @@
 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
@@ -19842,5 +19934,6 @@
 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:157
@@ -19972,10 +20065,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"Джерела (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:744
@@ -20041,5 +20135,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:801
 msgid "Use the default spellcheck file (recommended)."
-msgstr "Використовувати типовий файл для перевірки правопису (рекомендується)."
+msgstr ""
+"Використовувати типовий файл для перевірки правопису (рекомендується)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:895
@@ -20121,5 +20216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -20224,5 +20319,5 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr "Показати поточне положення у відео-фрагменті"
@@ -20286,11 +20381,12 @@
 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
@@ -20313,6 +20409,6 @@
 msgstr ""
 "<html>Немає більше приєднаних ліній для завантаження з сервера.<br>Однак був "
-"знайдений можливий дублікат виділеної точки.<br><br>Виділена точка: ''{0}''."
-"<br>Можливий дублікат: ''{1}''<br>Провести злиття виділеної точки з "
+"знайдений можливий дублікат виділеної точки.<br><br>Виділена точка: "
+"''{0}''.<br>Можливий дублікат: ''{1}''<br>Провести злиття виділеної точки з "
 "дублікатом і продовжити завантаження лінії з сервера?</html>"
 
@@ -20323,5 +20419,6 @@
 #: ../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
@@ -20627,9 +20724,6 @@
 msgstr "Файли WMS (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -20640,10 +20734,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "База даних відключений для обслуговування"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -20653,16 +20747,16 @@
 "велику ділянку. Зменшіть ділянку або скористайтесь файлом planet.osm."
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "не можливо отримати аудіо потік з введеного аосилання"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "Аудіопристрій недоступний"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
@@ -20670,10 +20764,10 @@
 "сервер"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr "місто"
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -20681,17 +20775,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "лісовий масив"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr "фермерські угіддя"
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20699,7 +20793,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20709,5 +20803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20750,5 +20844,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20758,5 +20852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20766,5 +20860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20774,8 +20868,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -20789,5 +20883,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr "мультиполігон"
@@ -20798,5 +20892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20805,7 +20899,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20815,5 +20909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20823,5 +20917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20831,5 +20925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20839,5 +20933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20847,5 +20941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20855,5 +20949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20863,8 +20957,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -20874,62 +20968,63 @@
 msgstr "маршрут"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Необов’язкові атрибути:"
-
+msgstr "Атрибути"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "Модифікатори:"
-
+msgstr "Змінено"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Назва файлу"
-
+msgstr "Назва файлу:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Перелаз"
-
+msgstr "Розмір"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
-#, fuzzy
 msgid "Files of type:"
-msgstr "Види палива:"
-
+msgstr "Файли типу:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
 msgstr "Домівка"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "даосизм"
-
+msgstr "Список"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Наблизити"
-
+msgstr "Дивитись у:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Нова роль"
-
+msgstr "Нова тека"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Створити нову точку."
-
+msgstr "Створити теку"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Зберегти"
-
+msgstr "Зберегти у:"
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
-msgstr ""
+msgstr "Рівнем вище"
 
 #. Plugin AddrInterpolation
@@ -20950,5 +21045,6 @@
 #: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
-msgstr "Спеціальний обробник для сервера WMS французького земельного кадастру."
+msgstr ""
+"Спеціальний обробник для сервера WMS французького земельного кадастру."
 
 #. Plugin colorscheme
@@ -21009,5 +21105,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 "Дозволяє завантажити точки GPS з Globalsat dg100 data logger безпосередньо в "
@@ -21111,5 +21208,6 @@
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr "Запускає FireFox для показу поточного виду, як гарного SVG зображення."
+msgstr ""
+"Запускає FireFox для показу поточного виду, як гарного SVG зображення."
 
 #. Plugin photo_geotagging
@@ -21173,6 +21271,6 @@
 "background and request updates."
 msgstr ""
-"Показує «рухому мапу» у JOSM. Ви можете завантажувати квадрати «рухомої мапи» "
-"у якості тла та надсилати запити на її оновлення."
+"Показує «рухому мапу» у JOSM. Ви можете завантажувати квадрати «рухомої "
+"мапи» у якості тла та надсилати запити на її оновлення."
 
 #. Plugin surveyor
@@ -21202,6 +21300,16 @@
 msgstr "Зробити ряд будинків по вулиці з одного блоку."
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+"Надає допоміжну клавішу, яка допомагає працювати із однокнопковою мишею "
+"(стілусом). Зараз доступна лише одна додаткова клавіша для перетягування "
+"мапи."
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21212,5 +21320,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21221,10 +21329,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21235,5 +21343,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21246,5 +21354,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21255,15 +21363,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21274,5 +21382,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22164,7 +22272,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -22304,8 +22412,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"/>
@@ -22515,5 +22623,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22523,5 +22631,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22540,5 +22648,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22548,5 +22656,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22565,5 +22673,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22573,5 +22681,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22590,5 +22698,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22598,5 +22706,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22611,5 +22719,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22627,5 +22735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -22643,5 +22751,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22650,5 +22758,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -22658,5 +22766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -22676,5 +22784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22683,5 +22791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22691,5 +22799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -23393,5 +23501,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -23442,5 +23550,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -23537,5 +23645,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -23703,5 +23811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -24035,5 +24143,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24043,5 +24151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24051,5 +24159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24059,5 +24167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24067,5 +24175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24075,5 +24183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24083,5 +24191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24092,5 +24200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25510,5 +25618,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25518,5 +25626,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25526,5 +25634,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25534,5 +25642,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25896,7 +26004,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25906,5 +26014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25914,5 +26022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25922,5 +26030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25930,5 +26038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25938,5 +26046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25946,5 +26054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25954,5 +26062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25962,5 +26070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25970,5 +26078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25978,5 +26086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25986,5 +26094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25994,5 +26102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26002,5 +26110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26010,5 +26118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26018,5 +26126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26026,5 +26134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26034,5 +26142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26042,5 +26150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26050,5 +26158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26058,5 +26166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26066,5 +26174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26074,5 +26182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26082,5 +26190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26090,5 +26198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26098,5 +26206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26106,5 +26214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26114,5 +26222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26122,5 +26230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26130,5 +26238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26138,5 +26246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26146,5 +26254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26154,5 +26262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26162,5 +26270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26170,5 +26278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26178,5 +26286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26186,5 +26294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26194,5 +26302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26202,5 +26310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26210,5 +26318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26218,5 +26326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26226,5 +26334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26234,5 +26342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26242,5 +26350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26250,5 +26358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26258,5 +26366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26266,5 +26374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -27970,7 +28078,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27980,5 +28088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27988,5 +28096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27996,5 +28104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28004,5 +28112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28012,5 +28120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28020,5 +28128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28028,5 +28136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28036,5 +28144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -29457,5 +29565,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29471,5 +29579,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29479,5 +29587,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -29488,5 +29596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29499,7 +29607,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29509,5 +29617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29517,5 +29625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29525,5 +29633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29533,5 +29641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -29565,5 +29673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29579,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29587,5 +29695,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29594,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29602,5 +29710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -29611,5 +29719,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -29634,5 +29742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -29747,9 +29855,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
@@ -29757,5 +29865,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,
@@ -29765,8 +29873,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
@@ -29780,5 +29888,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -29786,5 +29894,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29833,6 +29941,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>
@@ -29912,5 +30020,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29920,11 +30028,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -29940,5 +30048,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29947,5 +30055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29954,5 +30062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29968,5 +30076,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29980,5 +30088,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29987,5 +30095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29994,5 +30102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30001,5 +30109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30008,5 +30116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30015,5 +30123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30022,5 +30130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30029,5 +30137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30036,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30043,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30050,5 +30158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30057,5 +30165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30064,5 +30172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30071,5 +30179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -30078,5 +30186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -30253,7 +30361,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30267,5 +30375,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30275,7 +30383,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30285,5 +30393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30293,5 +30401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30301,5 +30409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30309,5 +30417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -30323,5 +30431,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30330,5 +30438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30338,5 +30446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30345,5 +30453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30352,5 +30460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30359,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30366,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30373,5 +30481,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30380,5 +30488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30387,5 +30495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30394,5 +30502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30401,5 +30509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -30413,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -30425,5 +30533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30432,5 +30540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -30444,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -30457,5 +30565,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -30470,5 +30578,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -30482,5 +30590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -30494,5 +30602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30501,5 +30609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30508,5 +30616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30516,5 +30624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30523,5 +30631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30530,5 +30638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30537,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30545,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30554,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30562,7 +30670,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30572,5 +30680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30580,5 +30688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30588,5 +30696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30597,5 +30705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30604,5 +30712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30612,5 +30720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30620,5 +30728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30628,5 +30736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30636,5 +30744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30644,5 +30752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30652,5 +30760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30660,5 +30768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30668,5 +30776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30676,5 +30784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -30697,5 +30805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -30710,7 +30818,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30720,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30727,5 +30835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30735,5 +30843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30742,5 +30850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30750,5 +30858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30758,5 +30866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -30772,5 +30880,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30781,5 +30889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -30798,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30806,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30817,5 +30925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30834,5 +30942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30841,5 +30949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30848,5 +30956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30855,7 +30963,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30866,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -30879,5 +30987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -30891,5 +30999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30899,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -30911,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -30923,5 +31031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30930,5 +31038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30937,7 +31045,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30947,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30955,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30963,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30971,5 +31079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30979,5 +31087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -30993,7 +31101,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -31008,5 +31116,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -31021,5 +31129,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -31034,5 +31142,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -31047,5 +31155,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -31060,5 +31168,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -31073,7 +31181,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31083,5 +31191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31090,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31098,5 +31206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31106,5 +31214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31114,5 +31222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31122,5 +31230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31130,5 +31238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31138,5 +31246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31146,5 +31254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31154,5 +31262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31162,5 +31270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31170,5 +31278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31178,5 +31286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -31196,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -31209,5 +31317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -31220,7 +31328,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31230,5 +31338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31238,5 +31346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31246,5 +31354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31254,5 +31362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31262,5 +31370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31270,5 +31378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31278,5 +31386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31286,5 +31394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31294,5 +31402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31302,5 +31410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31310,5 +31418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31318,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31326,5 +31434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31334,5 +31442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31342,5 +31450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31350,5 +31458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -31370,5 +31478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -31382,7 +31490,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31392,5 +31500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31400,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31408,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31416,5 +31524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31424,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31432,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31440,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31448,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31456,5 +31564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31464,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -31481,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31489,5 +31597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31497,5 +31605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31505,5 +31613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31513,5 +31621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31521,5 +31629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31529,5 +31637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31537,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31545,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31553,5 +31661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31561,5 +31669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31569,5 +31677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -31586,5 +31694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31593,5 +31701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31601,5 +31709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31608,5 +31716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31616,5 +31724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31624,5 +31732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31632,5 +31740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31639,5 +31747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31647,5 +31755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31655,5 +31763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31663,5 +31771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31671,5 +31779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31678,5 +31786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31685,5 +31793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31692,5 +31800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31699,5 +31807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31706,5 +31814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31713,5 +31821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31720,5 +31828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31727,5 +31835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31734,5 +31842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31741,5 +31849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31748,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31755,5 +31863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31762,5 +31870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31770,5 +31878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31778,5 +31886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31786,5 +31894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31794,5 +31902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31802,5 +31910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31810,5 +31918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31818,5 +31926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31826,5 +31934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31834,5 +31942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31843,5 +31951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31851,5 +31959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31859,5 +31967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31867,5 +31975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31875,5 +31983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31883,5 +31991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31891,5 +31999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31899,5 +32007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31907,5 +32015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31915,5 +32023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31923,5 +32031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31931,5 +32039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31939,5 +32047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31947,5 +32055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31955,5 +32063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31963,5 +32071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -31971,5 +32079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31979,5 +32087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31987,5 +32095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31995,5 +32103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32002,5 +32110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -32032,5 +32140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32040,5 +32148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32048,7 +32156,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -32063,5 +32171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32071,5 +32179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32079,5 +32187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32087,5 +32195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32095,5 +32203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32103,5 +32211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32111,5 +32219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -32125,7 +32233,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32135,5 +32243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32143,5 +32251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32151,5 +32259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32159,5 +32267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32167,5 +32275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32175,5 +32283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32183,5 +32291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32191,5 +32299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32199,5 +32307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32207,5 +32315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32215,5 +32323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32223,5 +32331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32231,5 +32339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32239,5 +32347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32247,5 +32355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32255,5 +32363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32263,5 +32371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32271,5 +32379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32279,5 +32387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32287,5 +32395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32295,5 +32403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32303,5 +32411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32311,5 +32419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32319,5 +32427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32327,5 +32435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32335,5 +32443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32343,5 +32451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32351,5 +32459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32359,5 +32467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32367,5 +32475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32375,5 +32483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32383,5 +32491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32391,5 +32499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32399,5 +32507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32407,5 +32515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32415,5 +32523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32423,5 +32531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32431,5 +32539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32439,5 +32547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32447,5 +32555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32455,5 +32563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32463,5 +32571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -32497,7 +32605,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32507,5 +32615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32515,5 +32623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32523,5 +32631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32531,5 +32639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32539,5 +32647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32547,5 +32655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32555,5 +32663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -32570,5 +32678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32578,5 +32686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32586,5 +32694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32594,5 +32702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32602,5 +32710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32610,5 +32718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32619,5 +32727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32627,5 +32735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -32635,5 +32743,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32643,5 +32751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32650,5 +32758,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32657,5 +32765,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -32673,7 +32781,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32683,5 +32791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32691,5 +32799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32699,5 +32807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32707,5 +32815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32715,5 +32823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32723,5 +32831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32731,5 +32839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32739,5 +32847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32747,5 +32855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -32763,5 +32871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -32775,5 +32883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -32787,5 +32895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32795,5 +32903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -32807,5 +32915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -32819,6 +32927,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32828,5 +32936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -32840,5 +32948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -32852,5 +32960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -32864,5 +32972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -32876,5 +32984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -32888,5 +32996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32896,7 +33004,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32906,5 +33014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32914,5 +33022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32922,5 +33030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32930,5 +33038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -32945,5 +33053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -32956,5 +33064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -32968,5 +33076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -32980,5 +33088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -32992,5 +33100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33001,5 +33109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33009,5 +33117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33017,5 +33125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33025,5 +33133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33033,5 +33141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -33048,5 +33156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -33060,5 +33168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -33072,5 +33180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -33084,5 +33192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -33096,5 +33204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -33109,5 +33217,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?
@@ -33133,5 +33241,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33142,11 +33250,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33156,5 +33264,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33164,5 +33272,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33172,5 +33280,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33180,5 +33288,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33188,5 +33296,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33196,5 +33304,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33204,5 +33312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33212,5 +33320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33220,5 +33328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33228,5 +33336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33236,5 +33344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33244,5 +33352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -33262,5 +33370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -33355,5 +33463,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -33361,28 +33469,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
@@ -33464,5 +33572,6 @@
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
-msgstr "максимальна швидкість руху транспорту дозволена на пішохідній доріжці"
+msgstr ""
+"максимальна швидкість руху транспорту дозволена на пішохідній доріжці"
 
 #. way  : I : highway == steps && maxspeed == *
@@ -33497,5 +33606,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33508,5 +33617,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>
@@ -33531,6 +33640,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33539,6 +33648,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33553,6 +33662,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
@@ -33566,6 +33675,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
@@ -33585,6 +33694,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33608,6 +33717,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
@@ -33620,30 +33729,51 @@
 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 "Errors during Download"
+#~ msgstr "Помилки під час отримання даних"
 
 #~ msgid "Deleted or moved primitives"
 #~ msgstr "Вилучені або переміщені елементи"
 
+#, java-format
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
+
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Стек команд: {0}"
 
+#~ msgid "Apply also for children"
+#~ msgstr "Застосувати також для нащадків"
+
 #~ msgid "GPS point"
 #~ msgstr "точка GPS"
 
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Надсилання об’єктів. Кількість —  {0}…"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Створити не звукові мітки при обробці GPX даних"
+
+#, java-format
 #~ msgid "reverter: {0}"
 #~ msgstr "відновлювач: {0}"
+
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 21602)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 19:20+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-06 14:43+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-02 08:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -89,5 +89,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -193,7 +193,5 @@
 "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
@@ -202,7 +200,5 @@
 "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
@@ -211,7 +207,5 @@
 "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
@@ -240,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -249,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,6 +257,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -317,6 +311,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 +334,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
@@ -433,6 +427,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -642,12 +636,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -1308,6 +1302,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
@@ -1365,7 +1359,5 @@
 "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
@@ -1430,5 +1422,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1449,5 +1442,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1595,5 +1588,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr "顯示有與程式錯誤相關資訊的狀態報告"
 
@@ -1615,5 +1609,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1743,7 +1737,5 @@
 "<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
@@ -1752,6 +1744,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
@@ -1812,5 +1804,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* 一個用於多條路徑或用於那些路徑之一的節點，或"
 
@@ -1878,9 +1871,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)"
@@ -1897,5 +1890,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -1954,7 +1947,5 @@
 "<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
@@ -2160,7 +2151,5 @@
 "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
@@ -2187,6 +2176,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
 msgstr "下載時發生錯誤"
 
@@ -2219,7 +2208,7 @@
 msgstr "({0}/{1}) 正在載入關係 {2} 的上層項目"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "下載時發生錯誤"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2247,7 +2236,5 @@
 "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:91
@@ -2350,8 +2337,7 @@
 #: ../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
@@ -2416,7 +2402,5 @@
 "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
@@ -2433,7 +2417,5 @@
 "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
@@ -2473,111 +2455,110 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "搜尋..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "搜尋物件。"
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "請輸入過濾條件字串。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "請輸入搜尋字串。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "請輸入搜尋語詞"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "取代選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "加入至選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "從選擇區域移除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "在選擇區域中尋找"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "區分大小寫"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "正規表示式"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Baker Street</b> - 「Baker」和「Street」出現在何設定鍵或名稱中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Baker Street\"</b> -  「Baker Street」出現在何設定鍵或名稱中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - 「Bak」出現在名稱中的任何地方。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - 含有設定鍵「type」為「route」者。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - 設定鍵「type」為任何數值。也可以使用 <b>*=value</b>、"
-"<b>type=</b>、<b>*=*</b>、<b>*=</b>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<b>type=*</b> - 設定鍵「type」為任何數值。也可以使用 "
+"<b>*=value</b>、<b>type=</b>、<b>*=*</b>、<b>*=</b>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - 名稱中沒有「Bak」。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>是否為單行道？</b> - oneway=yes, true, 1 或 on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot 設定為任何數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊的目標：</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>類型：</b> - 物件的類型 (<b>節點(node)</b>, <b>路徑(way)</b>, <b>關係"
-"(relation)</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+"<b>類型：</b> - 物件的類型 (<b>節點(node)</b>, <b>路徑(way)</b>, <b>關係(relation)</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>使用者：</b>... - 所有由某使用者改變的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - 所有物件是由匿名使用者所改變的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - 以此為 ID 的物件 (0 為新的物件)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2585,20 +2566,17 @@
 msgstr "<b>版本：</b>... - 查看這個版本的物件（未指定版本則為 0 個物件）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
 "assigned changeset)"
-msgstr ""
-"<b>變更組合：</b>... - 查看這個變更組合 id 的物件（未指定變更組合則為 0 個物"
-"件）"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgstr "<b>變更組合：</b>... - 查看這個變更組合 id 的物件（未指定變更組合則為 0 個物件）"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr "<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2606,61 +2584,65 @@
 msgstr "<b>tags:</b>... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
 "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> ...)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+"<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:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>修改過</b> - 所有改變過的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選取的</b> - 所有選取的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>不完整</b> - 所有不完整的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>未標籤的</b> - 所有未標籤的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>expr</i></b> - 所有物件的子項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>expr</i></b> - 所有物件父項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "使用 <b>|</b> 或 <b>OR</b> 做邏輯或運算"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr "使用 <b>\"</b> 將運算子包起來（例如當鍵值包含 <b>:</b>）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"有引號的字串 <b>\"</b> 和 <b>\\</b> 字元需要在前頭加上 <b>\\</b> (例如 <b>\\"
-"\"</b> 和 <b>\\\\</b>)。"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+"有引號的字串 <b>\"</b> 和 <b>\\</b> 字元需要在前頭加上 <b>\\</b> (例如 <b>\\\"</b> 和 <b>\\\\"
+"</b>)。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "使用 <b>(</b> 和 <b>)</b> 將正規表示式群組起來"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2668,38 +2650,38 @@
 msgstr "過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "送出過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "開始搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "找不到「{0}」的符合項"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "在選擇區域中搜尋不到「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2707,5 +2689,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2713,5 +2695,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2719,5 +2701,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2735,50 +2717,53 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "樣式語法錯誤：在 {1} 中的樣式 {0} 是無效的！"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr "不明的原型類型：{0}。允許的數值為 node、 way 或 relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "未預期的記號。應該為 {0}，卻發現 {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "未預期的記號：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr "缺少 OR 的參數"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr "缺少 NOT 的運算子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr "預期的原型 id"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr "預期的數字範圍"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr "預期的變更組合 id"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr "預期的版本"
@@ -2795,7 +2780,5 @@
 "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
@@ -2823,6 +2806,5 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} 關係形成一個循環，因為它們互相參照對方。<br>JOSM 不能上傳它們。請編"
-"輯這個關係並移除掉這個循環相依性。</html>"
+"<html>{0} 關係形成一個循環，因為它們互相參照對方。<br>JOSM 不能上傳它們。請編輯這個關係並移除掉這個循環相依性。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2846,5 +2828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -2955,7 +2937,5 @@
 "<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
@@ -3049,10 +3029,8 @@
 #: ../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:459
@@ -3180,7 +3158,5 @@
 "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
@@ -3310,9 +3286,7 @@
 #, 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
@@ -3394,5 +3368,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3401,5 +3375,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3408,5 +3382,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3443,5 +3417,5 @@
 msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3450,6 +3424,6 @@
 "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
@@ -3492,11 +3466,9 @@
 "with lower version {2} is not visible. Cannot deal with this inconsistency. "
 "Keeping target object. "
-msgstr ""
-"id {0} 版本 {1} 的目標物件是可視的，但是來源物件 (較低版本 {2}) 是隱藏的。不"
-"能處理這個不一致的情形。保留目標物件。 "
+msgstr "id {0} 版本 {1} 的目標物件是可視的，但是來源物件 (較低版本 {2}) 是隱藏的。不能處理這個不一致的情形。保留目標物件。 "
 
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3504,5 +3476,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3510,17 +3482,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "文字"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr "C"
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3528,5 +3494,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3535,5 +3501,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3541,5 +3507,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3547,5 +3513,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3553,42 +3519,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>過濾條件已使用</h2>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 物件已隱藏"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 物件已停用"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>關閉過濾條件對話盒以查看所有的物件。<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "ID = 0 的原型不能為不可視。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "預期 ID > 0。收到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "預期版本 > 0。收到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3597,5 +3563,5 @@
 msgstr "不能將 changesetId > 0 指派給新的原型。changesetId 的數值為 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3603,5 +3569,5 @@
 msgstr "不能合併，因為參與的原型是新的但其他的卻不是"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3654,5 +3620,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "不能比較 ID「{0}」和 ID「{1}」的原型。"
 
@@ -3662,81 +3629,81 @@
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "區域類型的路徑並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "找到一個以上「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "找到一個以上「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "找到一個以上的「經過」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "「{0}」的不明成員類型。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "找不到「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "找不到「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "找到一個以上「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "「從」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "「到」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "找不到限制 {0} 的樣式"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "內部路徑「{0}」的樣式等同多邊形。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "外部路徑「{0}」的樣式不符。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "錯誤：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3910,5 +3877,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>無法讀取書籤<br>''{0}''<br>錯誤為：{1}</html>"
 
@@ -3978,5 +3946,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3986,5 +3954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3993,5 +3961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4000,5 +3968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4007,5 +3975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4014,5 +3982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4021,9 +3989,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4177,6 +4145,5 @@
 "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
@@ -4184,7 +4151,5 @@
 "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
@@ -4192,6 +4157,5 @@
 "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
@@ -4339,6 +4303,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4353,4 +4317,5 @@
 msgstr "編輯"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4499,6 +4464,5 @@
 "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
@@ -4509,6 +4473,5 @@
 "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
@@ -4518,6 +4481,5 @@
 "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
@@ -4548,5 +4510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4567,6 +4529,5 @@
 "<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
@@ -4586,10 +4547,9 @@
 "<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
@@ -4619,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"
@@ -4626,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"
@@ -4633,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"
@@ -4843,5 +4803,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr "將他們選取的元件複製到合併元件清單的結尾"
 
@@ -4866,6 +4827,7 @@
 msgstr "將他們所有的元素複製到目標"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4877,5 +4839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "下"
@@ -4920,6 +4882,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>"
 
@@ -4927,6 +4889,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>"
 
@@ -4974,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 "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
 
@@ -5000,7 +4962,5 @@
 "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
@@ -5016,7 +4976,5 @@
 "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
@@ -5145,6 +5103,5 @@
 "<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
@@ -5193,6 +5150,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5205,6 +5162,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5447,6 +5404,5 @@
 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
@@ -5459,7 +5415,6 @@
 "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>"
 
@@ -5473,7 +5428,6 @@
 "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>"
 
@@ -5508,10 +5462,8 @@
 #: ../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
@@ -5535,5 +5487,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr "從 OSM 伺服器下載關於已選取變更組合的資訊"
 
@@ -5551,6 +5504,5 @@
 msgstr "開啟每個已選取變更組合的網頁"
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5574,5 +5526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5580,5 +5532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5651,14 +5603,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
@@ -5675,13 +5627,13 @@
 msgstr "調解「{0}」的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr "過濾物件並隱藏/停用它們。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5690,45 +5642,41 @@
 msgstr "加入"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr "加入過濾條件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr "編輯過濾條件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr "刪除過濾條件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr "將過濾條件上移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr "將過濾條件下移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr "啟用過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr "隱藏元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr "也套用到子項目"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr "反轉過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr "過濾條件模式"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -5955,10 +5903,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr "在關係清單中選擇"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr "在關係清單中選擇。"
@@ -6134,6 +6082,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
@@ -6299,4 +6247,5 @@
 msgstr "ID"
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7201,6 +7150,5 @@
 "<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
@@ -7370,6 +7318,5 @@
 "<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
@@ -7387,7 +7334,5 @@
 "<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
@@ -7405,6 +7350,5 @@
 "<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
@@ -7415,9 +7359,7 @@
 #, 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
@@ -7426,7 +7368,5 @@
 "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
@@ -7438,17 +7378,15 @@
 "<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
@@ -7460,7 +7398,5 @@
 "<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
@@ -7472,7 +7408,5 @@
 "<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
@@ -7565,7 +7499,5 @@
 "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
@@ -7573,5 +7505,5 @@
 msgstr "這個變更組合查詢 URL 是無效的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7579,23 +7511,23 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr "空白的數值代表刪除該標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "是否改變數值？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7603,5 +7535,5 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7609,77 +7541,81 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "請選擇一個數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "請選擇您要改變屬性的物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "屬性/成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "選取物件的屬性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr "選擇關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr "選擇主要選擇區域的關係。"
@@ -7791,9 +7727,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
@@ -7810,9 +7746,7 @@
 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
@@ -7826,7 +7760,5 @@
 "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
@@ -7966,15 +7898,13 @@
 "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
@@ -8164,7 +8094,5 @@
 "<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
@@ -8277,7 +8205,5 @@
 "<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
@@ -8308,9 +8234,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>不論 <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
@@ -8369,4 +8296,5 @@
 msgstr "查詢名稱伺服器..."
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8449,12 +8377,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\">缺少求助主題的內容</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
@@ -8463,10 +8390,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
@@ -8475,7 +8402,5 @@
 "<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
@@ -8499,6 +8424,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"));
@@ -8743,14 +8668,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
@@ -8764,11 +8689,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
@@ -8779,6 +8704,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
@@ -8807,7 +8732,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
@@ -8968,7 +8893,5 @@
 "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
@@ -8976,7 +8899,5 @@
 "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
@@ -9012,5 +8933,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr "開啟檔案選擇器來選擇檔案"
@@ -9027,5 +8948,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr "圖層「{0}」已被修改，應上傳至伺服器。"
 
@@ -9096,7 +9018,5 @@
 "<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
@@ -9111,9 +9031,7 @@
 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
@@ -9125,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 "
@@ -9132,6 +9050,5 @@
 "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
@@ -9188,7 +9105,5 @@
 "<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
@@ -9352,5 +9267,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9376,5 +9291,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr "這個變更組合在這次上傳後會<strong>關閉</strong>"
 
@@ -9392,6 +9308,5 @@
 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
@@ -9404,6 +9319,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
@@ -9413,6 +9328,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
@@ -9428,15 +9343,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
@@ -9476,7 +9391,5 @@
 "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
@@ -9490,11 +9403,10 @@
 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
@@ -9503,5 +9415,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9509,6 +9421,5 @@
 "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
@@ -9526,5 +9437,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}"
 
@@ -9533,6 +9445,5 @@
 "<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
@@ -9577,7 +9488,5 @@
 "<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
@@ -9598,7 +9507,5 @@
 "<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
@@ -9607,7 +9514,5 @@
 "<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
@@ -9745,10 +9650,9 @@
 #, 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
@@ -9773,10 +9677,8 @@
 #, 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:373
@@ -9836,9 +9738,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-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:819
@@ -9851,5 +9751,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -9901,6 +9801,5 @@
 "<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:1126
@@ -9954,6 +9853,5 @@
 "server."
 msgstr[0] ""
-"{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> <br>"
-"了。因為它已經從伺服器上刪除了。"
+"{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> <br>了。因為它已經從伺服器上刪除了。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
@@ -10012,6 +9910,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 ""
 
@@ -10066,10 +9964,9 @@
 #: ../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
@@ -10135,64 +10032,68 @@
 msgstr "自動猜測"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr "手動調整"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "在 exif 資料中有地理位置的照片 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "已加上標籤的照片 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr "在地圖上顯示圖片縮圖"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "位移："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "將圖片與 GPX 軌跡關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "無效的時區"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "無效的移位"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr "再試一次"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr "尚未選擇 gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10201,20 +10102,20 @@
 msgstr[0] "<html>已比對 <b>{0}</b> / <b>{1}</b> 照片至 GPX 軌跡。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "時區：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10222,5 +10123,5 @@
 msgstr[0] "({0} 天的時間差異)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10228,21 +10129,21 @@
 msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid "Matching photos to track failed"
 msgstr "比對相片至軌跡失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "調整時區並補償"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 msgid "The selected photos do not contain time information."
 msgstr "選取的相片未包含時刻資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "相片未包含時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10250,17 +10151,17 @@
 msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX 軌跡沒有時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "您應該選擇一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "沒有選取的 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10271,5 +10172,5 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10322,14 +10223,14 @@
 msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "關聯到 GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10337,5 +10238,5 @@
 msgstr[0] "已載入 {0} 張圖片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10343,18 +10244,17 @@
 msgstr[0] "發現 {0} 已有 GPS 標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "從磁碟刪除圖片檔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
 "<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>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+msgstr "<html><h3>是否從磁碟刪除檔案 {0}？<p>這個照片檔案會永久消失！</h3></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10517,6 +10417,5 @@
 "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
@@ -10582,7 +10481,5 @@
 "<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
@@ -10623,7 +10520,5 @@
 "<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
@@ -10647,9 +10542,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
@@ -10666,17 +10561,15 @@
 "<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
@@ -10697,6 +10590,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
@@ -10720,6 +10613,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
@@ -10779,6 +10672,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
@@ -10801,9 +10694,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
@@ -10839,6 +10732,5 @@
 "<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
@@ -10872,6 +10764,5 @@
 "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
@@ -10915,5 +10806,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr "無法以使用者「{0}」密碼「***」驗證為 OAuth 使用者"
 
@@ -11027,6 +10919,5 @@
 "<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
@@ -11048,13 +10939,12 @@
 "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
@@ -11073,6 +10963,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
@@ -11113,6 +11003,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
@@ -11128,6 +11018,7 @@
 "token.</html>"
 msgstr ""
-"<html>無法存取 OSM 伺服器「{0}」<br>存取記號為「{0}」。<br>伺服器將存取記號視"
-"為未授權而拒絕。您將<br>無法使用這個記號存取伺服器上任何受保護的資源。</html>"
+"<html>無法存取 OSM "
+"伺服器「{0}」<br>存取記號為「{0}」。<br>伺服器將存取記號視為未授權而拒絕。您將<br>無法使用這個記號存取伺服器上任何受保護的資源。</ht"
+"ml>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
@@ -11142,8 +11033,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 ""
 
@@ -11160,4 +11051,7 @@
 "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
@@ -11166,16 +11060,12 @@
 "<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
@@ -11245,34 +11135,30 @@
 msgstr "顯示即時音效追蹤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "讀取 GPX 時建立非音效標記。"
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "具有效時間戳記的明確航點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "以軌跡位置判斷明確航點的時刻"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "已命名的軌跡點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "音效檔案的修改次數（時間戳記）。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr "軌跡的開頭（如果沒有其他的標記可用就會這麼做）。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "顯示或隱藏主要選單列的音效選單項目。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11280,5 +11166,5 @@
 msgstr "顯示會移動的圖示來顯示出目前播放的音效所記錄同步於軌跡上的點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11286,21 +11172,15 @@
 msgstr "在音效（和圖片、網頁）標記的按鈕圖示旁放上文字標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr "開啟 GPX 圖層時自動從任何航點製作標記圖層。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "匯入音效時，由此製作標記..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr "匯入音效時，將它套用到 GPX 圖層的任何航點中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11308,5 +11188,5 @@
 msgstr "從軌跡點（非明確的航點）自動建立音效標記，並加上名稱或描述。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11314,5 +11194,5 @@
 msgstr "依據每個匯入的音效 WAV 檔案修改的時刻在軌跡上的位置建立音效標記。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11320,17 +11200,17 @@
 msgstr "當按下相對的加速快轉或倒轉時的秒數"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "快轉/倒轉時間(秒)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr "快速快轉時速度的倍數"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "高速快轉倍數"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11338,13 +11218,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgstr "聲音錄製器耗費時間與實際耗費時間的比例"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr ""
@@ -11384,5 +11264,5 @@
 msgstr "顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11393,34 +11273,34 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "None"
 msgstr "沒有"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "如果沒有匯入區段時強制繪出的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "繪出大型 GPS 點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr "從 HDOP 數值繪製圓形。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速率（紅 = 慢，綠 = 快）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Single Color (can be customized for named layers)"
 msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -11428,5 +11308,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11448,5 +11328,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11488,5 +11368,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11500,50 +11380,60 @@
 msgstr "步行"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "繪出方向箭頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "快速繪製（看起來較醜）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "只有重要的方向提示（例如單行道標籤）。"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "只在路徑的開頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "繪製區段順序編號"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "繪出已下載資料的邊界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "在選擇模式繪出虛擬節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "將未使用的圖層以其他顏色繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑化地圖圖片（反鉅齒）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "開啟 GPX 圖層時自動從任何航點製作標記圖層。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 點之間繪出線條"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11551,34 +11441,35 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr "本地端檔案最大長度（公尺）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "最大長度（公尺）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11586,13 +11477,13 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（像素）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "將 GPS 點以較大的點繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11600,9 +11491,9 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "依速度來為點和軌跡區段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11610,46 +11501,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "軌跡與點的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "繪出路徑區段的方向提示。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "繪出所有區段在其路徑中的順序編號。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "繪出從伺服器下載資料的邊界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "將未使用的資料圖層以不同的顏色繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM 資料"
@@ -11721,5 +11613,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11766,6 +11659,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr "更新外掛程式"
@@ -11835,7 +11728,5 @@
 "<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
@@ -11844,6 +11735,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 ""
 
@@ -11856,9 +11747,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 ""
 
@@ -12128,5 +12019,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:491
 msgid "Add the selected available styles to the list of active styles"
-msgstr ""
+msgstr "將選取的樣式加入使用中樣式清單"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:514
@@ -12155,7 +12046,7 @@
 #, 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>"
+msgstr "<html>無法從這裡載入樣式來源清單：<br>「{0}」。<br><br>詳細資料 (未翻譯):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
@@ -12163,5 +12054,5 @@
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr ""
+msgstr "警告：樣式清單「{0}」中項目的格式不正確。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
@@ -12266,5 +12157,5 @@
 "<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
 "validate again.</html>"
-msgstr ""
+msgstr "<html>「{0}」不是有效的 OSM API URL。<br>請檢查拼字後再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
@@ -12276,7 +12167,7 @@
 #, 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>"
+msgstr "<html>無法建立 URL「{0}」來驗證 OSM API 伺服器。<br>請檢查「{1}」的拼字後再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -12285,5 +12176,5 @@
 "<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
 "''{1}'' and your Internet connection and validate again.</html>"
-msgstr ""
+msgstr "<html>無法建立連線到 URL「{0}」。<br>請檢查「{1}」的拼字與您的網際網路連線後再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
@@ -12297,7 +12188,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 ""
+"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
@@ -12308,4 +12201,6 @@
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
+"<html>OSM API 伺服器「{0}」並未傳回有效的回應。<br>可能「{0}」不是 OSM API "
+"伺服器。<br>請檢查「{0}」的拼字並再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
@@ -12316,5 +12211,5 @@
 msgid ""
 "Select to use HTTP basic authentication with your OSM username and password"
-msgstr ""
+msgstr "選擇以使用您的 OSM 使用者名稱和密碼進行 HTTP 驗證"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
@@ -12324,5 +12219,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
 msgid "Select to use OAuth as authentication mechanism"
-msgstr ""
+msgstr "選擇以使用 OAuth 做為驗證機制"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
@@ -12331,5 +12226,5 @@
 "Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
 "authentication method ''Basic Authentication''."
-msgstr ""
+msgstr "警告：在偏好設定「{0}」中有不支援的數值，發現「{1}」。使用的驗證方式為「基礎驗證」。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
@@ -12356,8 +12251,11 @@
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
 msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr ""
+msgstr "警告：無法從憑證管理程式取回 OSM 憑證。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
@@ -12367,17 +12265,18 @@
 #, java-format
 msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+msgstr "目前的憑證管理程式類型為「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
 msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr ""
+msgstr "警告：無法將 OSM 憑證儲存到憑證管理程式。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr "警告：無法從憑證管理程式取回 OAuth 存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
 msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr ""
+msgstr "警告：無法將 OAuth 存取記號儲存到憑證管理程式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
@@ -12385,9 +12284,10 @@
 "You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorize first."
-msgstr ""
+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 ""
+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
@@ -12397,5 +12297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
 msgid "Click to step through the OAuth authorization process"
-msgstr ""
+msgstr "點選以進行 OAuth 授權程序"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
@@ -12407,14 +12307,14 @@
 "Click to step through the OAuth authorization process and generate a new "
 "Access Token"
-msgstr ""
+msgstr "點選以進行 OAuth 授權程序並產生新的存取記號"
 
 #: ../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 ""
+msgstr "點選以使用目前的存取記號進行對 OSM 伺服器的測試存取"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
 #, java-format
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
-msgstr ""
+msgstr "<html>使用預設的 OSM 伺服器 URL (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
@@ -12436,9 +12336,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
 msgid "Validation failed. The API URL seems to be invalid."
-msgstr ""
+msgstr "驗證失敗。API URL 似乎是無效的。"
 
 #: ../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 ""
+msgstr "OSM API URL 不能為空白。請輸入 OSM API URL。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
@@ -12480,7 +12380,8 @@
 #: ../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)"
+msgstr ""
+"使用標準的系統設定值 (已停用。使用 <tt>-Djava.net.useSystemProxies=true</tt> 啟動 JOSM 可以啟用它)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -12496,7 +12397,5 @@
 "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
@@ -12524,5 +12423,5 @@
 "Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
 "be the same as in values"
-msgstr ""
+msgstr "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469
@@ -12645,5 +12544,5 @@
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
 "a bounding box)"
-msgstr ""
+msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上下載 URL 指定綁定方塊)"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
@@ -12675,5 +12574,5 @@
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
-msgstr ""
+msgstr "警告：在伺服器功能元素「{1}」的屬性「{0}」數值無效。得到「{2}」"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12714,5 +12613,5 @@
 #, java-format
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
-msgstr ""
+msgstr "在變更組合查詢 url 中有未預期的數值「{0}」，得到 {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -12721,10 +12620,10 @@
 "Cannot create a changeset query including both the query parameters ''uid'' "
 "and ''display_name''"
-msgstr ""
+msgstr "不能同時使用查詢參數「uid」和「display_name」建立變更組合查詢"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr ""
+msgstr "在變更組合查詢字串中不支援的參數「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
@@ -12732,5 +12631,5 @@
 msgid ""
 "Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "在偏好設定「{0}」中連接埠號有未預期的格式。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
@@ -12745,5 +12644,5 @@
 #, java-format
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
+msgstr "在偏好設定「{0}」中有無效的連接埠號。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
@@ -12757,7 +12656,5 @@
 "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
@@ -12766,5 +12663,5 @@
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
 "''{1}''."
-msgstr ""
+msgstr "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
@@ -12773,9 +12670,9 @@
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
 "''{1}''."
-msgstr ""
+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
@@ -12790,4 +12687,5 @@
 "time.  Will not use a proxy."
 msgstr ""
+"警告：JVM 並未設定從系統設定值查詢代理伺服器。屬性「java.net.useSystemProxies」在啟動時遺失了。將不使用代理伺服器。"
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
@@ -12903,5 +12801,5 @@
 "Error occured while parsing gpx file {0}. Only part of the file will be "
 "available"
-msgstr ""
+msgstr "解析 gpx 檔案 {0} 時發生錯誤。檔案將只有部分可以使用"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
@@ -12947,5 +12845,5 @@
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "開啟資源「{0}」的輸入串流失敗"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105
@@ -12954,10 +12852,11 @@
 "Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
 "zip file ''{0}''. Exception was: {1}"
-msgstr ""
+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."
-msgstr ""
+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
@@ -13009,5 +12908,5 @@
 "Server replied with response code 404, retrying with an individual request "
 "for each primitive."
-msgstr ""
+msgstr "伺服器傳回代碼 404，以每個原型個別要求的方式重試。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
@@ -13053,5 +12952,5 @@
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
-msgstr ""
+msgstr "偏好設定「{0}」遺失。不能初始化 OsmApi。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
@@ -13064,5 +12963,5 @@
 "It supports protocol version 0.6, while the server says it supports {0} to "
 "{1}."
-msgstr ""
+msgstr "它支援通訊協定版本 0.6，但伺服器說它支援 {0} 到 {1} 版。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
@@ -13081,5 +12980,5 @@
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "已修改原型「{0}」的新版本有未預期的格式。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
@@ -13140,15 +13039,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
 msgid "Current changeset is null. Cannot upload data."
-msgstr ""
+msgstr "目前的變更組合為 null。不能上傳資料。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
-msgstr ""
+msgstr "目前的變更組合 ID 必須大於 0。目前的 ID 是 {0}。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
-msgstr ""
+msgstr "需要開放的變更組合。卻找到 id {0} 的關閉變更組合。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
@@ -13175,5 +13074,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
 msgid "Prolog of OsmChange document already written. Please write only once."
-msgstr ""
+msgstr "OsmChange 文件的序言已寫入。請只寫入一次。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
@@ -13181,5 +13080,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
 msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
+msgstr "OsmChange 文件的序言尚未寫入。請先進行寫入。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -13207,5 +13106,5 @@
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
+msgstr "類型 long 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:82
@@ -13217,5 +13116,5 @@
 "Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
 "''{1}''."
-msgstr ""
+msgstr "類型 long (>=0)的必要屬性「{0}」有不合格的數值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112
@@ -13224,5 +13123,5 @@
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
+msgstr "類型 double 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
@@ -13231,5 +13130,5 @@
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
+msgstr "類型 boolean 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
@@ -13244,5 +13143,5 @@
 "Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
 "''{1}''."
-msgstr ""
+msgstr "類型 OsmPrimitiveType 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
@@ -13251,5 +13150,5 @@
 "Warning: unsupported start element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr ""
+msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -13257,5 +13156,5 @@
 "Illegal document structure. Found node, way, or relation outside of "
 "''create'', ''modify'', or ''delete''."
-msgstr ""
+msgstr "不合格的文件結構。發現節點、路徑或關係並非「create」、「modify」或「delete」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13264,5 +13163,5 @@
 "Warning: unsupported end element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr ""
+msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
@@ -13282,10 +13181,10 @@
 #, java-format
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "屬性「{0}」有不合格的數字值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:117
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "屬性「{0}」有不合格的布林值。得到「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
@@ -13294,5 +13193,5 @@
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
-msgstr ""
+msgstr "缺少 XML 元素「{0}」的必要屬性「{1}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
@@ -13306,5 +13205,5 @@
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
+msgstr "在輸入串流中發現未定義的元素「{0}」。正在中止。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:218
@@ -13314,5 +13213,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
-msgstr ""
+msgstr "無法以 OAuth 驗證標頭簽署 HTTP 連線"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
@@ -13340,12 +13239,12 @@
 #, 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>"
+msgstr "<html>從備份檔案還原時發生錯誤。<br>錯誤為：<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
+msgstr "無法備份檔案。例外為：{0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
@@ -13367,12 +13266,14 @@
 #, 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}''."
+msgstr ""
+"元素「bounds」缺少必要的屬性。得到 "
+"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 ""
+msgstr "發現 XML 元素 <nd> 並未做為元素 <way> 的直接子項。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
@@ -13380,5 +13281,5 @@
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr ""
+msgstr "路徑 {1} 的 <nd> 缺少必要的屬性「{0}」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
@@ -13403,11 +13304,12 @@
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
-msgstr ""
+msgstr "在關係 {0} 的成員缺少屬性「ref」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr "在關係 {0} 的成員屬性「ref」有不合格的數值。得到 {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
@@ -13415,5 +13317,5 @@
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr ""
+msgstr "在關係 {1} 的成員 {0} 缺少屬性「type」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
@@ -13422,5 +13324,5 @@
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr ""
+msgstr "在關係 {1} 的成員 {0} 屬性「type」有不合格的數值。得到 {2}。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
@@ -13437,5 +13339,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
 msgid "Missing key or value attribute in tag."
-msgstr ""
+msgstr "標籤中缺少設定鍵或數值屬性。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13458,5 +13360,5 @@
 "Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
 "{1}."
-msgstr ""
+msgstr "在 OSM 原型 ID {0} 的屬性「version」有不合格的數值。得到 {1}。"
 
 #. default version in 0.5 files for existing primitives
@@ -13473,5 +13375,5 @@
 "WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
 "API version is ''{3}''. Got {1}."
-msgstr ""
+msgstr "警告：將元素 {0} 的屬性「version」數值一般化為 {2}，API 版本為「{3}」。得到 {1}。"
 
 #. should not happen. API version has been checked before
@@ -13480,5 +13382,5 @@
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
-msgstr ""
+msgstr "不明或不支援的 API 版本。得到 {0}。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
@@ -13486,5 +13388,5 @@
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr ""
+msgstr "在 OSM 原型 ID {0} 缺少屬性「version」。"
 
 #. for a new primitive we just log a warning
@@ -13497,5 +13399,5 @@
 "Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
 "Resetting to 0."
-msgstr ""
+msgstr "在新物件 {1} 的屬性「changeset」有不合格的數值。得到 {0}。重設為 0。"
 
 #. for an existing primitive this is a problem
@@ -13525,5 +13427,5 @@
 msgid ""
 "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
+msgstr "外部 ID「{0}」的路徑包含了缺少的外部 ID「{1}」的節點。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
@@ -13531,5 +13433,5 @@
 #, java-format
 msgid "Deleted node {0} is part of way {1}"
-msgstr ""
+msgstr "刪除的節點 {0} 是路徑 {1} 的一部分"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
@@ -13539,5 +13441,5 @@
 "Way {0} with {1} nodes has incomplete nodes because at least one node was "
 "missing in the loaded data."
-msgstr ""
+msgstr "有 {1} 個節點的路徑 {0} 有不完整的節點，因為在載入的資料中至少有一個節點遺失了。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
@@ -13547,5 +13449,5 @@
 "Relation with external id ''{0}'' refers to a missing primitive with "
 "external id ''{1}''."
-msgstr ""
+msgstr "外部 id「{0}」的關係包含了缺少的外部 id「{1}」的原型。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
@@ -13553,5 +13455,5 @@
 #, java-format
 msgid "Deleted member {0} is used by relation {1}"
-msgstr ""
+msgstr "刪除的成員 {0} 正由關係 {1} 使用"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
@@ -13638,5 +13540,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
-msgstr ""
+msgstr "缺少了 XML 標籤 <user>。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
@@ -13654,5 +13556,5 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
-msgstr ""
+msgstr "XML 標籤「{1}」的屬性「{0}」有不合格的數值。得到 {2}。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
@@ -13662,24 +13564,24 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
+msgstr "開妒以每個原型一次要求的方式上傳 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳節點「{4}」 (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳路徑「{4}」 (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳關係「{4}」 (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "正在開始以一次要求上傳 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
@@ -13704,5 +13606,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "發現未預期的 id 0 osm 原型"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
@@ -13728,5 +13630,5 @@
 "Warning: Cannot download plugin ''{0}''. Its download link is not known. "
 "Skipping download."
-msgstr ""
+msgstr "警告：不能下載外掛程式「{0}」。它的下載連結不明。正略過下載。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
@@ -13735,5 +13637,5 @@
 "Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
 "valid URL. Skipping download."
-msgstr ""
+msgstr "警告：不能下載外掛程式「{0}」。它的下載連結「{1}」不是有效的 URL。正略過下載。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
@@ -13757,6 +13659,5 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "下列外掛程式已不再需要且切換為不使用："
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
@@ -13767,4 +13668,6 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
+"<html>已要求載入外掛程式「{0}」。<br>這個外掛程式已不再開發並且很有可能產生問題。<br>它應該被停用。<br>是否從偏好設定中刪除？</ht"
+"ml>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13772,5 +13675,5 @@
 "You updated your JOSM software.<br>To prevent problems the plugins should be "
 "updated as well.<br><br>Update plugins now?"
-msgstr ""
+msgstr "您已經更新了 JOSM 軟體。<br>為了避免問題也應該更新外掛程式。<br><br>是否立即更新？"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
@@ -13781,5 +13684,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
 msgid "Click to update the activated plugins"
-msgstr ""
+msgstr "點選以更新使用中的外掛程式"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13789,5 +13692,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
 msgid "Click to skip updating the activated plugins"
-msgstr ""
+msgstr "點選以略過更新使用中的外掛程式"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
@@ -13795,5 +13698,5 @@
 "Skipping plugin update after JOSM upgrade. Automatic update at startup is "
 "disabled."
-msgstr ""
+msgstr "略過在 JOSM 升級後的外掛程式更新。啟動時自動更新已停用。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
@@ -13801,5 +13704,5 @@
 "Skipping plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr ""
+msgstr "略過在經過更新時間間隔後的外掛程式更新。啟動時自動更新已停用。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
@@ -13807,5 +13710,5 @@
 "Running plugin update after JOSM upgrade. Automatic update at startup is "
 "enabled."
-msgstr ""
+msgstr "執行在 JOSM 升級後的外掛程式更新。啟動時自動更新已啟用。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
@@ -13813,5 +13716,5 @@
 "Running plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr ""
+msgstr "執行在經過更新時間間隔後的外掛程式更新。啟動時自動更新已啟用。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
@@ -13819,5 +13722,5 @@
 msgid ""
 "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
-msgstr ""
+msgstr "偏好設定「{1}」有未預期的數值「{0}」。推測數值應為「ask」。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
@@ -13828,75 +13731,73 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "找不到外掛程式 {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>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+"<html>外掛程式 {0} 需要 JOSM 版本 {1}。目前的 JOSM 版本為 {2}。<br>您必須更新 JOSM "
+"才能使用這個外掛程式。</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "無法載入外掛程式 {0}。是否從偏好設定中刪除？"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
 "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
 "not found.<br>Delete from preferences?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "無法載入外掛程式 {0}。是否從偏好設定中刪除？"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+msgstr "<html>無法載入外掛程式 {0} 因為外掛程式<br>main 類別「{1}」找不到。<br>是否從偏好設定刪除？"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr "正在載入外掛程式 ..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+msgstr[0] "JOSM 找不到下列外掛程式的相關資訊："
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+msgstr[0] "這個外掛程式將不會被載入。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+msgstr[0] "更新下列外掛程式失敗："
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13905,64 +13806,63 @@
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+msgstr[0] "請在 JOSM 啟動後開啟偏好設定對話盒並試著手動更新。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+msgstr "警告：無法下載外掛程式資料清單"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "停用外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr "保留外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+msgstr "警告：無法刪除過時的外掛程式「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
 "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
 "installation. JOSM is still going to load the old plugin version."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+msgstr "警告：無法安裝已下載的外掛程式「{0}」。正在略過安裝。JOSM 仍然會載入舊的外掛程式版本。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
 "Warning: failed to install plugin ''{0}'' from temporary download file "
 "''{1}''. Renaming failed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+msgstr "警告：無法從暫存下載檔案「{1}」安裝外掛程式「{0}」。仍然失敗。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
 #, java-format
 msgid ""
@@ -13970,19 +13870,19 @@
 msgstr "發生未預期的例外，可能來自「{0}」外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "根據此外掛程式的資訊，作者是 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "在回報程式錯誤前請先嘗試將外掛程式升級到最新版本。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "是否停用此外掛程式？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -13990,23 +13890,23 @@
 msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr "外掛程式資訊"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "沒有描述可用"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
 "change it later)"
-msgstr ""
+msgstr "不要再詢問並記住我的決定 (稍後可至 偏好設定->外掛程式 改變它)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:81
 #, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "外掛程式檔案「{0}」沒有包含 Manifest。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:225
@@ -14018,14 +13918,14 @@
 #, java-format
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
-msgstr ""
+msgstr "無法從外掛程式「{0}」的 manifest 建立外掛程式資訊"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
 msgid "Reading local plugin information.."
-msgstr ""
+msgstr "正在讀取本地端外掛程式資訊.."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:81
 msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "正在處理外掛程式網站快取檔案..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:85
@@ -14038,6 +13938,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
-msgstr ""
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr "警告：無法掃描檔案「{0}」的外掛程式資訊。正在略過。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:106
@@ -14060,10 +13961,10 @@
 "Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
 "from plugin site ''{1}''."
-msgstr ""
+msgstr "警告：無法建立外掛程式目錄「{0}」。不能從外掛程式網站「{1}」快取外掛程式清單。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:192
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "正在將外掛程式清單寫入本地端快取「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:233
@@ -14078,5 +13979,5 @@
 "Failed to parse plugin list document from site ''{0}''. Skipping site. "
 "Exception was: {1}"
-msgstr ""
+msgstr "無法解析網站「{0}」的外掛程式清單文件。正在略過網站。例外為：{1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:265
@@ -14098,5 +13999,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"
@@ -14112,5 +14013,5 @@
 "are running the latest<br>version of JOSM, please consider being kind and "
 "file a bug report."
-msgstr ""
+msgstr "發生未預期的例外。<br>這通常是程式碼的錯誤。如果您使用的是最新版的<br>JOSM，請考慮不吝回報錯誤。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
@@ -14122,5 +14023,5 @@
 "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 ""
+msgstr "您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
@@ -14128,5 +14029,5 @@
 "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 +14036,5 @@
 "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 +14042,5 @@
 "Alternatively, if that does not work you can manually fill in the "
 "information below at this URL:"
-msgstr ""
+msgstr "另外，如果這些都不行您也可以在這個 URL 自行填寫資訊："
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
@@ -14149,5 +14050,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
 msgid "You have encountered a bug in JOSM"
-msgstr ""
+msgstr "您遇到了 JOSM 的程式錯誤"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:42
@@ -14156,5 +14057,5 @@
 "<html>Failed to initialize communication with the OSM server {0}.<br>Check "
 "the server URL in your preferences and your internet connection.</html>"
-msgstr ""
+msgstr "<html>無法初始化與 OSM 伺服器 {0} 的連線。<br>請檢查您偏好設定中伺服器 URL 和網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
@@ -14166,4 +14067,6 @@
 "Access Token.</html>"
 msgstr ""
+"<html>無法驗證 OSM 伺服器「{0}」。<br>您正使用 OAuth 驗證但目前尚未設定<br>OAuth "
+"存取記號。<br>請開啟偏好設定對話盒並產生或輸入存取記號。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
@@ -14174,4 +14077,6 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
+"<html><strong>無法</strong>刪除<strong>關係 {0}</strong>。它仍然被關係 {1} 參照。<br>請載入關係 "
+"{1}，移除對關係 {0} 的參照，並再上傳一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -14179,32 +14084,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 ""
+"current<br>dataset violates a precondition.<br>The error message "
+"is:<br>{0}</html>"
+msgstr ""
+"<html>上傳至伺服器<strong>失敗</strong>，因為您目前的<br>資料組合違反了先決條件。<br>錯誤的訊息為：<br>{0}</htm"
+"l>"
 
 #: ../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>"
+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>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>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
@@ -14213,5 +14123,5 @@
 "<html>Communication with the OSM server ''{0}'' timed out. Please retry "
 "later.</html>"
-msgstr ""
+msgstr "<html>與 OSM 伺服器「{0}」連線逾時。請稍後再試。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
@@ -14223,8 +14133,10 @@
 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 ""
+"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
@@ -14233,5 +14145,5 @@
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed.</html>"
-msgstr ""
+msgstr "<html>變更組合 <strong>{0}</strong> 的關閉失敗 <br>因為它已經被關閉了。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
@@ -14240,5 +14152,5 @@
 "<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
 "already been closed on {1}.</html>"
-msgstr ""
+msgstr "<html>變更組合 <strong>{0}</strong> 的關閉失敗 <br>因為它已經在 {1} 被關閉了。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
@@ -14247,9 +14159,9 @@
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
-msgstr ""
+msgstr "<html>伺服器回報它偵測到衝突。<br>錯誤訊息 (未翻譯)：<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:233
 msgid "<html>The server reported that it has detected a conflict.</html>"
-msgstr ""
+msgstr "<html>伺服器回報它偵測到衝突。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
@@ -14258,5 +14170,5 @@
 "<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
 "already been closed on {1}.</html>"
-msgstr ""
+msgstr "<html>無法上傳變更組合 <strong>{0}</strong><br>因為它已經被關閉於 {1}。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
@@ -14267,4 +14179,6 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
+"<html>基於安全性的理由無法連線到遠端伺服器<br>「{0}」<br>這大部分是因為您以 applet 執行<br>以及您沒有從「{1}」載入 "
+"applet。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:304
@@ -14273,5 +14187,5 @@
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr ""
+msgstr "<html>無法連線到遠端伺服器<br>「{0}」<br>請檢查您的網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -14292,6 +14206,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14303,7 +14218,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 ""
 
@@ -14335,9 +14250,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15003,7 +14918,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15013,5 +14928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15021,5 +14936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15035,5 +14950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15043,5 +14958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15072,5 +14987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15079,5 +14994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15086,5 +15001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15093,5 +15008,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15100,5 +15015,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15107,5 +15022,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15139,10 +15054,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"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 ""
 
@@ -15518,7 +15434,5 @@
 "<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
@@ -15624,34 +15538,35 @@
 msgstr "快取蘭勃特區發生錯誤"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "使用"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "請選擇要使用的配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "色彩配置"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "請選擇要刪除的配置。"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "使用從清單選取的配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "使用目前的顏色作為新的顏色配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "從清單中刪除選取的配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "顏色配置"
@@ -15726,5 +15641,5 @@
 msgstr "編輯 GPX 軌跡的圖層"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr "轉換為沒有時刻的 GPX 圖層"
@@ -15815,4 +15730,5 @@
 msgstr "連接埠："
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15877,6 +15793,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
@@ -16024,5 +15940,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16143,5 +16059,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr "在每個產生的路徑中允許的最大區段數。預設為 250。"
 
@@ -16156,15 +16073,13 @@
 "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
@@ -16447,6 +16362,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
@@ -16458,7 +16373,5 @@
 "<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
@@ -16473,5 +16386,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr "標頭包含許多數值而且不能對映為單一字串"
 
@@ -16541,7 +16455,5 @@
 "<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
@@ -16583,5 +16495,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16632,5 +16545,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -16891,5 +16805,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
 msgid "Tracks"
-msgstr ""
+msgstr "軌跡"
 
 #. item "Ways/Steps" text "Width (meters)"
@@ -16937,7 +16851,5 @@
 "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
@@ -16978,5 +16890,5 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
 msgid "Objects history"
-msgstr ""
+msgstr "物件歷史紀錄"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
@@ -17447,4 +17359,12 @@
 msgstr "連棟建築"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr "瀏覽"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17595,5 +17515,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:409
 msgid "Yes, save anyway"
-msgstr ""
+msgstr "是，強制儲存"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
@@ -17603,5 +17523,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
 msgid "No, resolve issues first"
-msgstr ""
+msgstr "不，先調解衝突"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:417
@@ -17887,6 +17807,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 ""
 
@@ -17942,5 +17862,5 @@
 msgctxt "keyboard-key"
 msgid "Key:"
-msgstr ""
+msgstr "鍵值："
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75
@@ -17972,8 +17892,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 ""
 
@@ -18027,8 +17947,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 ""
 
@@ -18140,6 +18060,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 ""
 
@@ -18147,6 +18067,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 ""
 
@@ -18594,5 +18514,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155
 msgid "<empty>"
-msgstr ""
+msgstr "<空白>"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163
@@ -18782,9 +18702,10 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"拼字檢查或標籤檢查資料檔案的來源（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:744
@@ -18930,5 +18851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19028,5 +18949,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19403,9 +19324,6 @@
 msgstr "WMS 檔案 (*.wms)"
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19414,38 +19332,36 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "資料庫離線維護中"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
 "request a smaller area, or use planet.osm"
-msgstr ""
-"最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet."
-"osm"
-
-#. OSM server message
-#: build/specialmessages.java:9
+msgstr "最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet.osm"
+
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "無法從輸入的 URL 取得音效輸入串流"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr "音效裝置無法使用"
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr "您必須將自己的編輯設為公開才能上傳新的資料"
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19453,17 +19369,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr ""
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19471,7 +19387,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19481,5 +19397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19522,5 +19438,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19530,5 +19446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19538,5 +19454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19546,8 +19462,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19561,5 +19477,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19570,5 +19486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19577,7 +19493,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19587,5 +19503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19595,5 +19511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19603,5 +19519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19611,5 +19527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19619,5 +19535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19627,5 +19543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19635,8 +19551,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19646,58 +19562,60 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "額外屬性："
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "特殊鍵："
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "檔案名稱"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "長釘"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "首頁"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "道教"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "拉近"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "新的角色"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "建立新的節點。"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "存檔"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19730,7 +19648,6 @@
 "true :-)"
 msgstr ""
-"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即"
-"可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM 偏好"
-"設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)"
+"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM "
+"偏好設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)"
 
 #. Plugin Create_grid_of_ways
@@ -19755,7 +19672,5 @@
 "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
@@ -19773,5 +19688,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。"
 
@@ -19793,6 +19709,6 @@
 "the filename of an image."
 msgstr ""
-"另一個用來將圖片與 GPX 檔案中的航點配對的外掛程式。配對的方式是當航點標籤的"
-"「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。"
+"另一個用來將圖片與 GPX "
+"檔案中的航點配對的外掛程式。配對的方式是當航點標籤的「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。"
 
 #. Plugin lakewalker
@@ -19813,7 +19729,5 @@
 "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
@@ -19841,6 +19755,5 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
-"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問"
-"題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
+"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
 
 #. Plugin openlayers
@@ -19918,6 +19831,5 @@
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
 "background and request updates."
-msgstr ""
-"在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
+msgstr "在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
 
 #. Plugin surveyor
@@ -19937,7 +19849,5 @@
 "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
@@ -19946,6 +19856,13 @@
 msgstr "讓連棟房屋能超出單一區塊。"
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19954,5 +19871,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19961,19 +19878,17 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
-msgstr ""
-"OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標"
-"籤名稱的拼字檢查。"
+msgstr "OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標籤名稱的拼字檢查。"
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19983,5 +19898,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19990,15 +19905,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20007,5 +19922,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20895,7 +20810,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21035,8 +20950,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"/>
@@ -21246,5 +21161,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21254,5 +21169,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21271,5 +21186,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21279,5 +21194,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21296,5 +21211,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21304,5 +21219,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21321,5 +21236,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21329,5 +21244,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21342,5 +21257,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21358,5 +21273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21374,5 +21289,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21381,5 +21296,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21389,5 +21304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21407,5 +21322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21414,5 +21329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21422,5 +21337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22124,5 +22039,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22173,5 +22088,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22268,5 +22183,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22434,5 +22349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22766,5 +22681,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22774,5 +22689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22782,5 +22697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22790,5 +22705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22798,5 +22713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22806,5 +22721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22814,5 +22729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22823,5 +22738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24241,5 +24156,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24249,5 +24164,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24257,5 +24172,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24265,5 +24180,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24627,7 +24542,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24637,5 +24552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24645,5 +24560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24653,5 +24568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24661,5 +24576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24669,5 +24584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24677,5 +24592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24685,5 +24600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24693,5 +24608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24701,5 +24616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24709,5 +24624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24717,5 +24632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24725,5 +24640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24733,5 +24648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24741,5 +24656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24749,5 +24664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24757,5 +24672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24765,5 +24680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24773,5 +24688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24781,5 +24696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24789,5 +24704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24797,5 +24712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24805,5 +24720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24813,5 +24728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24821,5 +24736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24829,5 +24744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24837,5 +24752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24845,5 +24760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24853,5 +24768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24861,5 +24776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24869,5 +24784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24877,5 +24792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24885,5 +24800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24893,5 +24808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24901,5 +24816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24909,5 +24824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -24917,5 +24832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -24925,5 +24840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -24933,5 +24848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -24941,5 +24856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -24949,5 +24864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -24957,5 +24872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -24965,5 +24880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -24973,5 +24888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -24981,5 +24896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -24989,5 +24904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -24997,5 +24912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26701,7 +26616,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26711,5 +26626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26719,5 +26634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26727,5 +26642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26735,5 +26650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26743,5 +26658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26751,5 +26666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26759,5 +26674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26767,5 +26682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28188,5 +28103,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28202,5 +28117,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28210,5 +28125,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28219,5 +28134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28230,7 +28145,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28240,5 +28155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28248,5 +28163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28256,5 +28171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28264,5 +28179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28296,5 +28211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28310,5 +28225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28318,5 +28233,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28325,5 +28240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28333,5 +28248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28342,5 +28257,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28365,5 +28280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28478,9 +28393,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
@@ -28488,5 +28403,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,
@@ -28496,8 +28411,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
@@ -28511,5 +28426,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28517,5 +28432,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28564,6 +28479,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>
@@ -28643,5 +28558,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28651,11 +28566,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28671,5 +28586,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28678,5 +28593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28685,5 +28600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28699,5 +28614,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28711,5 +28626,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28718,5 +28633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28725,5 +28640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28732,5 +28647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28739,5 +28654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28746,5 +28661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28753,5 +28668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28760,5 +28675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28767,5 +28682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28774,5 +28689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28781,5 +28696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28788,5 +28703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28795,5 +28710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28802,5 +28717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28809,5 +28724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -28984,7 +28899,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -28998,5 +28913,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29006,7 +28921,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29016,5 +28931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29024,5 +28939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29032,5 +28947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29040,5 +28955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29054,5 +28969,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29061,5 +28976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29069,5 +28984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29076,5 +28991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29083,5 +28998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29090,5 +29005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29097,5 +29012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29104,5 +29019,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29111,5 +29026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29118,5 +29033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29125,5 +29040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29132,5 +29047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29144,5 +29059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29156,5 +29071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29163,5 +29078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29175,5 +29090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29188,5 +29103,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29201,5 +29116,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29213,5 +29128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29225,5 +29140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29232,5 +29147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29239,5 +29154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29247,5 +29162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29254,5 +29169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29261,5 +29176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29268,5 +29183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29276,5 +29191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29285,5 +29200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29293,7 +29208,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29303,5 +29218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29311,5 +29226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29319,5 +29234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29328,5 +29243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29335,5 +29250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29343,5 +29258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29351,5 +29266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29359,5 +29274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29367,5 +29282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29375,5 +29290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29383,5 +29298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29391,5 +29306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29399,5 +29314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29407,5 +29322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29428,5 +29343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29441,7 +29356,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29451,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29458,5 +29373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29466,5 +29381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29473,5 +29388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29481,5 +29396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29489,5 +29404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29503,5 +29418,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29512,5 +29427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29529,5 +29444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29537,5 +29452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29548,5 +29463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29565,5 +29480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29572,5 +29487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29579,5 +29494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29586,7 +29501,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29597,5 +29512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29610,5 +29525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29622,5 +29537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29630,5 +29545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29642,5 +29557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29654,5 +29569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29661,5 +29576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29668,7 +29583,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29678,5 +29593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29686,5 +29601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29694,5 +29609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29702,5 +29617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29710,5 +29625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29724,7 +29639,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29739,5 +29654,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29752,5 +29667,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29765,5 +29680,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29778,5 +29693,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29791,5 +29706,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29804,7 +29719,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29814,5 +29729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29821,5 +29736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29829,5 +29744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29837,5 +29752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29845,5 +29760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29853,5 +29768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29861,5 +29776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29869,5 +29784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29877,5 +29792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29885,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29893,5 +29808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29901,5 +29816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29909,5 +29824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -29927,5 +29842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -29940,5 +29855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -29951,7 +29866,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -29961,5 +29876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -29969,5 +29884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -29977,5 +29892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -29985,5 +29900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -29993,5 +29908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30001,5 +29916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30009,5 +29924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30017,5 +29932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30025,5 +29940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30033,5 +29948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30041,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30049,5 +29964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30057,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30065,5 +29980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30073,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30081,5 +29996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30101,5 +30016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30113,7 +30028,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30123,5 +30038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30131,5 +30046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30139,5 +30054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30147,5 +30062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30155,5 +30070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30163,5 +30078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30171,5 +30086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30179,5 +30094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30187,5 +30102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30195,5 +30110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30212,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30220,5 +30135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30228,5 +30143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30236,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30244,5 +30159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30252,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30260,5 +30175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30268,5 +30183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30276,5 +30191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30284,5 +30199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30292,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30300,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30317,5 +30232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30324,5 +30239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30332,5 +30247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30339,5 +30254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30347,5 +30262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30355,5 +30270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30363,5 +30278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30370,5 +30285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30378,5 +30293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30386,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30394,5 +30309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30402,5 +30317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30409,5 +30324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30416,5 +30331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30423,5 +30338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30430,5 +30345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30437,5 +30352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30444,5 +30359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30451,5 +30366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30458,5 +30373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30465,5 +30380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30472,5 +30387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30479,5 +30394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30486,5 +30401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30493,5 +30408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30501,5 +30416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30509,5 +30424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30517,5 +30432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30525,5 +30440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30533,5 +30448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30541,5 +30456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30549,5 +30464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30557,5 +30472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30565,5 +30480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30574,5 +30489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30582,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30590,5 +30505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30598,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30606,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30614,5 +30529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30622,5 +30537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30630,5 +30545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30638,5 +30553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30646,5 +30561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30654,5 +30569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30662,5 +30577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30670,5 +30585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30678,5 +30593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30686,5 +30601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30694,5 +30609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30702,5 +30617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30710,5 +30625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30718,5 +30633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30726,5 +30641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30733,5 +30648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30763,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30771,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30779,7 +30694,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30794,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30802,5 +30717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30810,5 +30725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30818,5 +30733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30826,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30834,5 +30749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30842,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30856,7 +30771,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30866,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30874,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30882,5 +30797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30890,5 +30805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30898,5 +30813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30906,5 +30821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -30914,5 +30829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -30922,5 +30837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -30930,5 +30845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -30938,5 +30853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -30946,5 +30861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -30954,5 +30869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -30962,5 +30877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -30970,5 +30885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -30978,5 +30893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -30986,5 +30901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -30994,5 +30909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31002,5 +30917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31010,5 +30925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31018,5 +30933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31026,5 +30941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31034,5 +30949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31042,5 +30957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31050,5 +30965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31058,5 +30973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31066,5 +30981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31074,5 +30989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31082,5 +30997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31090,5 +31005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31098,5 +31013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31106,5 +31021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31114,5 +31029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31122,5 +31037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31130,5 +31045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31138,5 +31053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31146,5 +31061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31154,5 +31069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31162,5 +31077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31170,5 +31085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31178,5 +31093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31186,5 +31101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31194,5 +31109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31228,7 +31143,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31238,5 +31153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31246,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31254,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31262,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31270,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31278,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31286,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31301,5 +31216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31309,5 +31224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31317,5 +31232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31325,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31333,5 +31248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31341,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31350,5 +31265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31358,5 +31273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31366,5 +31281,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31374,5 +31289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31381,5 +31296,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31388,5 +31303,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31404,7 +31319,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31414,5 +31329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31422,5 +31337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31430,5 +31345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31438,5 +31353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31446,5 +31361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31454,5 +31369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31462,5 +31377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31470,5 +31385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31478,5 +31393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31494,5 +31409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31506,5 +31421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31518,5 +31433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31526,5 +31441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31538,5 +31453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31550,6 +31465,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31559,5 +31474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31571,5 +31486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31583,5 +31498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31595,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31607,5 +31522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31619,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31627,7 +31542,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31637,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31645,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31653,5 +31568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31661,5 +31576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31676,5 +31591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31687,5 +31602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31699,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31711,5 +31626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31723,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31732,5 +31647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31740,5 +31655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31748,5 +31663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31756,5 +31671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31764,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31779,5 +31694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31791,5 +31706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31803,5 +31718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31815,5 +31730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31827,5 +31742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31840,5 +31755,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?
@@ -31864,5 +31779,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31873,11 +31788,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31887,5 +31802,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31895,5 +31810,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31903,5 +31818,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31911,5 +31826,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -31919,5 +31834,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -31927,5 +31842,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -31935,5 +31850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -31943,5 +31858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -31951,5 +31866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -31959,5 +31874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -31967,5 +31882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -31975,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -31993,5 +31908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32086,5 +32001,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32092,28 +32007,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
@@ -32228,5 +32143,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32239,5 +32154,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>
@@ -32262,6 +32177,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32270,6 +32185,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32284,6 +32199,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
@@ -32297,6 +32212,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
@@ -32316,6 +32231,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32339,6 +32254,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
@@ -32373,6 +32288,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 "選取的路徑有不同的關係成員。是否仍要將它們組合？"
 
@@ -32386,4 +32301,5 @@
 #~ msgstr "只能在 JOSM 線上求助中編輯求助頁面"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "載入頁面 {0} 時發生錯誤"
@@ -32396,6 +32312,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 "選取的節點有不同的關係成員。是否仍要合併它們？"
 
@@ -32416,6 +32332,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 "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。"
 
@@ -32424,6 +32340,5 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？"
 
@@ -32446,4 +32361,7 @@
 #~ msgstr "沒有匯入資料。"
 
+#~ msgid "Errors during Download"
+#~ msgstr "下載時發生錯誤"
+
 #~ msgid "Data Layer"
 #~ msgstr "資料圖層"
@@ -32455,7 +32373,9 @@
 #~ msgstr "與伺服器連線時發生錯誤。"
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "URL 解析錯誤：「{0}」"
 
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "無法讀取 URL：「{0}」"
@@ -32465,10 +32385,8 @@
 
 #~ 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"
@@ -32481,11 +32399,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"
-
+#~ msgstr "nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 nodes:10-20"
+
+#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "id 運算子數值錯誤：{0}。應使用數字。"
@@ -32500,19 +32418,25 @@
 #~ msgstr "關係"
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "多邊形路徑「{0}」並未封閉。"
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ 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 "No outer way for multipolygon ''{0}''."
 #~ msgstr "多邊形「{0}」沒有外部路徑。"
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "內部路徑「{0}」在外。"
@@ -32538,6 +32462,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32557,4 +32480,5 @@
 #~ msgstr "正在合併衝突。"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "圖層：{0}"
@@ -32591,4 +32515,5 @@
 #~ msgstr[0] "圖片"
 
+#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "檔案「{0}」的日期無法解析。"
@@ -32609,4 +32534,5 @@
 #~ msgstr "登入"
 
+#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
@@ -32621,10 +32547,16 @@
 #~ msgstr "與 GPS 單元同步時刻"
 
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "讀取 GPX 時建立非音效標記。"
+
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "連接 {0}..."
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "不能開啓偏好設定目錄：{0}"
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "路徑「{0}」和「{1}」之間的十字路。"
@@ -32639,4 +32571,5 @@
 #~ msgstr "套用部分解決方案"
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "指令堆疊：{0}"
@@ -32648,4 +32581,5 @@
 #~ msgstr "編輯屬性"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "作者：{0}"
@@ -32657,4 +32591,5 @@
 #~ msgstr "移陳選取的"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "關係編輯器：{0}"
@@ -32687,10 +32622,13 @@
 #~ 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} 的圖片"
@@ -32699,10 +32637,13 @@
 #~ 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} 在此軌跡中。"
@@ -32739,4 +32680,5 @@
 #~ msgstr "載入選擇區域"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32752,4 +32694,5 @@
 #~ "看到此訊息後請勿上傳任何資料。"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32777,6 +32720,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."
@@ -32831,4 +32774,5 @@
 #~ msgstr "分析時發生錯誤。"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32843,15 +32787,18 @@
 #~ 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} 版。"
@@ -32865,7 +32812,5 @@
 #~ "(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"
@@ -32878,4 +32823,5 @@
 #~ msgstr "在非-關係中發現 <member> 元件。"
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n"
@@ -32885,6 +32831,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 與所有外掛程式。"
 
@@ -32902,7 +32848,9 @@
 #~ 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}秒"
@@ -32941,9 +32889,8 @@
 #~ "確定要繼續嗎？"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
 #~ msgstr[0] "選擇區域包含 {0} 條路徑。確定要全部簡化？"
 
@@ -32951,7 +32898,9 @@
 #~ msgstr "檢驗目前的選擇區域或整個資料組合。"
 
+#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "目前的差分： {0}秒"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "請在 {0} 回報為 ticket"
@@ -32960,7 +32909,9 @@
 #~ msgstr "AgPifoJ - 有 Geotag 的相片"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "使用群組「{1}」的預設組合「{0}」"
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "使用預設組合「{0}」"
@@ -32978,4 +32929,5 @@
 #~ msgstr "蘭勃特區 2 快取檔案 (.2)"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "先將投影改變為 {0}。"
@@ -33027,6 +32979,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 "
@@ -33042,6 +32994,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"
@@ -33050,6 +33002,5 @@
 #~ "use."
 #~ msgstr ""
-#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會"
-#~ "在 WMS 選單中顯示出來。\n"
+#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會在 WMS 選單中顯示出來。\n"
 #~ "\n"
 #~ "您也可以在進階偏好設定中手動完成它，使用下列配置：\n"
@@ -33062,8 +33013,6 @@
 #~ "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"
@@ -33080,7 +33029,5 @@
 #~ "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."
@@ -33088,15 +33035,12 @@
 
 #~ 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"
@@ -33205,26 +33149,31 @@
 #~ 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>建立它。"
-
+#~ "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
 #~ 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}」"
@@ -33233,4 +33182,5 @@
 #~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
@@ -33242,22 +33192,29 @@
 #~ 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 "Parameter ''{0}'' must not be null"
 #~ msgstr "參數「{0}」不能為 null"
 
+#, 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 "
@@ -33268,4 +33225,5 @@
 #~ msgstr "永遠進行移動而不要顯示這個對話盒"
 
+#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -33275,4 +33233,5 @@
 #~ msgstr "至少要刪除一個物件，卻收到空白集合"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "參數「{0}」不能空白"
@@ -33284,23 +33243,30 @@
 #~ 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} 是無效的！"
+
 #~ msgid "Wrong number of parameters for tags operator."
 #~ 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"
-
+#~ "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
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33308,7 +33274,9 @@
 #~ 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}。"
@@ -33317,19 +33285,21 @@
 #~ 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}。"
@@ -33344,22 +33314,26 @@
 #~ 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"
 #~ msgstr "已刪除或移動的原型"
 
+#~ msgid "Apply also for children"
+#~ msgstr "也套用到子項目"
+
 #~ msgid "Dialog not created yet. Invoke createInstance() first"
 #~ msgstr "對話盒尚未建立。先呼叫 createInstance()"
 
+#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -33368,74 +33342,73 @@
 
 #~ 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>"
-
+#~ "<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
 #~ 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}」。將不使"
-#~ "用代理伺服器"
-
+#~ msgstr "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使用代理伺服器"
+
+#, java-format
 #~ msgid ""
 #~ "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
 #~ "''{1}''. Proxy won't be used"
-#~ msgstr ""
-#~ "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不"
-#~ "使用代理伺服器"
-
+#~ msgstr "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使用代理伺服器"
+
+#, java-format
 #~ msgid ""
 #~ "Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-#~ msgstr ""
-#~ "在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺"
-#~ "服器。"
-
+#~ msgstr "在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺服器。"
+
+#, java-format
 #~ msgid ""
 #~ "Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
 #~ "Proxy won't be used."
-#~ msgstr ""
-#~ "在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代"
-#~ "理伺服器。"
-
+#~ msgstr "在偏好設定「{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 ""
-#~ "<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 ""
@@ -33444,10 +33417,14 @@
 #~ "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 "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr "<html>不能開啟目錄。<br>請選擇一個檔案！</html>"
 
+#~ msgctxt "filter"
+#~ msgid "C"
+#~ msgstr "C"
+
 #~ msgid "Use all their elements"
 #~ msgstr "使用他們所有的元素"
